JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,608 Commits 1 Branch 0 Tags 481 MiB
9c9200605a
Commit Graph

10308 Commits

Author SHA1 Message Date
LCastr0
b5130181a2 Merging errors 2017-02-01 11:25:47 -02:00
Sam
c6bb850bc3 Lots of stuff 2017-01-30 23:28:55 +00:00
Sam
fb35f19c3d Add Villager Properties support 2017-01-30 19:09:07 +00:00
LCastr0
0ce741a5fb Small wings for cupid pet 2017-01-28 21:38:14 -02:00
LCastr0
2cfd51e38e Heart shaped wings 2017-01-27 17:40:35 -02:00
LCastr0
e2de60971e Fixed uneven butterfly wing 2017-01-27 10:29:18 -02:00
Sam
7200572583 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-26 20:10:48 +00:00
LCastr0
dd9f6e938d Added small butterfly wings 2017-01-26 09:56:21 -02:00
Alexander Meech
741d0914ba Change premium rank hover descriptions 2017-01-25 21:12:30 -06:00
cnr
b2d17f2680 Merge branch 'update/true-love-pet' into develop 2017-01-25 21:11:56 -06:00
cnr
70948b6967 Refactor PowerPlayClubItem instead of using an event 2017-01-25 21:10:32 -06:00
cnr
20efc234fa Allow YT to use /disguise 2017-01-25 20:33:25 -06:00
Sam
a62ecdb212 Custom Bridges and Per player world borders 2017-01-25 21:38:58 +00:00
Sam
692fcbacbb Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-24 17:18:29 +00:00
Sam
2c8b8d4fb0 Add max chests 2017-01-23 19:56:00 +00:00
LCastr0
340f629f09 Changed knockback in winroom 2017-01-21 20:13:19 -02:00
LCastr0
9876c0c61c Changed particles for wings 2017-01-21 19:58:59 -02:00
Sam
8102ba2e4b Lots of stuff 2017-01-21 20:45:22 +00:00
Sam
c7c7b4448f Use File.separator 2017-01-21 14:46:18 +00:00
Sam
0827ea2da0 World Listeners 2017-01-21 14:46:05 +00:00
Sam
24d71e09fe Teleport dead people 2017-01-21 14:45:58 +00:00
Sam
4c38a5878f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:28:57 +00:00
Sam
490d1d86f2 Give players their earnt gems 2017-01-21 14:24:04 +00:00
Sam
3557fd8acc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:21:03 +00:00
Sam
f5e86f4bc1 Update Villager trading and Events 2017-01-21 14:21:00 +00:00
LCastr0
023ed5ed4a Small fixes for win room 2017-01-20 22:12:01 -02:00
cnr
8ae74ce952 Increase 2FA window size 2017-01-20 15:42:21 -06:00
cnr
fbb1836eb5 Change Brawl fountain goal to 35M gems 2017-01-20 14:30:54 -06:00
Sam
a16acedb14 Google Sheets v2 finally 2017-01-20 20:08:24 +00:00
cnr
4bb51a3734 Fix non-[\x00-\x7F] characters breaking chat 2017-01-20 01:27:59 -06:00
samczsun
7c829f8712 Filter duplicates, handle permissions in multicommand, support more commands 2017-01-20 01:27:59 -06:00
samczsun
8b1fe8302e Match Bukkit tab completion behaviour 2017-01-20 01:27:58 -06:00
samczsun
cc9f28dfec Fix holes in Skywars 
Skywars's crumble affects any block which has been updated, including
blocks outside the game world. This commit checks if a block is in the
game world before crumbling it
 2017-01-20 01:27:58 -06:00
samczsun
c340e48daa Fix Amplifier NPCs disappearing 
Melon Launchers could be used to shove armor stands around. This has been
disabled
 2017-01-20 01:27:58 -06:00
samczsun
8479e80f8e Change intent of /hub to PLAYER_REQUEST 2017-01-20 01:27:58 -06:00
cnr
8fdbe87d1d Allow spaces when checking 2FA codes 2017-01-20 01:27:58 -06:00
cnr
fded8a6583 Change 2FA issuer on the test network 2017-01-20 01:27:58 -06:00
cnr
f23f04fdb1 Fix NPE in getOrLoadClient 2017-01-20 01:14:03 -06:00
cnr
8f72f9d087 Only require 2FA for MAPDEV+ 2017-01-20 01:14:03 -06:00
samczsun
8dc0961f03 Remove debug message 2017-01-19 23:12:29 -05:00
samczsun
f83550157c PC-1034 
The `z` variable wasn't being reset properly
 2017-01-19 23:12:26 -05:00
samczsun
66af3cc450 Fix parties mute bypass 2017-01-19 23:12:23 -05:00
samczsun
1ff05eb3ff Reset Magma Cube kill counter on game end 2017-01-19 23:12:11 -05:00
samczsun
7290b83466 Fix Skywars eating/bowing/whatevering bug 2017-01-19 21:24:50 -05:00
samczsun
5ca9b79333 Fix Fissure doing no damage 2017-01-19 18:49:51 -05:00
LCastr0
34bf89187d Added win room to gadget manager 2017-01-19 21:44:57 -02:00
LCastr0
d2c7e48903 Started on the battlefield win room 2017-01-19 21:17:17 -02:00
samczsun
343167245e Fix party chat 2017-01-19 18:16:43 -05:00
LCastr0
a6ab41fe3f Fixed cupid pet 2017-01-19 21:14:15 -02:00
Sam
8a9a3cb2ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-19 21:16:12 +00:00
Sam
36c0c56f27 World Events and Sheets rewrite 2017-01-19 21:15:06 +00:00
LCastr0
2fd0e72439 Changed type of love wings 2017-01-19 04:56:11 -02:00
LCastr0
da36276bc3 Changed permissions for unlockcosmetics command 2017-01-19 00:50:42 -06:00
LCastr0
6180162476 Now only remove on teleport if its void 2017-01-19 00:50:42 -06:00
LCastr0
704c787008 Fixed lava and void issues again, prevents CME 2017-01-19 00:50:42 -06:00
LCastr0
d7fe81184a Better message when despawning balloons 2017-01-19 00:50:42 -06:00
LCastr0
0d1f3a0613 Fixed balloons dying on void 
Fixed balloons bug near lava
Fixed balloons lore in menu
 2017-01-19 00:50:42 -06:00
LCastr0
7f22872dd6 Changed OpenBalloons so it actually opens the balloons menu 2017-01-19 00:50:42 -06:00
LCastr0
a1a0271cd9 Added balloons to gadgets 2017-01-19 00:50:42 -06:00
LCastr0
9cba2aa9fc Removed disabled balloons from chests 2017-01-19 00:50:42 -06:00
LCastr0
03aa049f40 Added balloons to chests 2017-01-19 00:50:42 -06:00
cnr
e3b56eda2a Add 2FA reset command 2017-01-19 00:15:17 -06:00
cnr
9831c7259a Enforce 2FA and re-enable unbans for trainee+ 2017-01-18 23:47:47 -06:00
samczsun
fd65f2df1b Tab completion for /game set 2017-01-18 23:34:57 -06:00
samczsun
6692432c42 Smart™ Tab Completion©® 2017-01-18 23:30:39 -06:00
samczsun
e5ece844cb Tab completion 2017-01-18 23:20:56 -06:00
samczsun
1bb96625f7 Add missing import 2017-01-18 23:20:24 -06:00
samczsun
2ffae9f078 Enable strict anticheat in Gladiators (Artix) 2017-01-18 23:20:24 -06:00
samczsun
c5d5d86c1d Use CoreClient instead of Player in case the player quits 2017-01-18 23:20:24 -06:00
samczsun
ac63985419 Revert removing strict anticheat 2017-01-18 23:20:24 -06:00
samczsun
cdc4f3debd Don't try to reload client if already loaded 2017-01-18 23:20:24 -06:00
samczsun
1ce69dfa14 PC-1054 PC-1164 
GameTeam can't handle spawnpoints which are also solid blocks, and
SurvivalGames has a chance of spawning a chest on a spawn platform. When
this happens, the next closest spawn is always the same spawn because the
two players will be exactly 1 block apart, causing everyone to spawn at
the same podium. This commit prevents SurvivalGames from generating random
chests on spawn podiums
 2017-01-18 23:20:24 -06:00
samczsun
cc7150850c PC-221 
In Block Hunt, hitting an entity will cause an "Cancelled Infection" event
to propagate upwards the stack. This commit checks whether the game is
live before beginning the cancellation
 2017-01-18 23:20:24 -06:00
samczsun
e309abc968 PC-1051 PC-1238 
Some kits had armor in the wrong order, causing them to render
incorrectly. This commit reorders the armor.
 2017-01-18 23:20:24 -06:00
samczsun
63357b0fc5 PC-1303 
In the 1.11 update, the override was mistakenly toggled off while spawning
in skeletons. This commit undoes that change.
 2017-01-18 23:20:24 -06:00
samczsun
8e5483e42b PC-190 
Ignoring listened on too high of a priority and chat managers didn't
respect the recipients list. Those two issues have been fixed in this
commit
 2017-01-18 23:20:24 -06:00
samczsun
d856736bf4 PC-1301 
If a player joins before any of our listeners are registered, they'll have
an account id of -1. If they manage to also not have a redis entry, their
cached id will also be -1. This breaks stuff. Instead, let's just kick
them.

Note that I'm not sending them using Portal because Portal is slow and I
want them off the server immediately
 2017-01-18 23:20:24 -06:00
samczsun
0ae4bd2281 PC-938 PC-1294 
For whatever reason, Minestrike nametags don't hide properly on
hotjoining. This is a simple fix which just resets all nametag
visibilities on game reset. Should work, right?
 2017-01-18 23:20:24 -06:00
samczsun
2bac38385f PC-1299 
In the 1.11 update, the override was mistakenly toggled off while spawning
in wither skeletons. This commit undoes that change.
 2017-01-18 23:20:24 -06:00
samczsun
4cd643f64f PC-1040 
In one of my previous commits, while migrating CompassAddon ->
CompassModule I accidentally removed two logical components. The first
prevented compasses from being given out in the pregame lobby, and the
second allowed players who were dead to receive compasses. Both have been
re-added.
 2017-01-18 23:20:24 -06:00
samczsun
283dd23920 PC-1298 
In the 1.11 update, the override was mistakenly toggled off while spawning
in horses. This commit undoes that change.
 2017-01-18 23:20:24 -06:00
LCastr0
912bad5035 Used wrong method name 2017-01-18 21:20:32 -02:00
LCastr0
1557f3a39c Added love chest to customer support server 2017-01-18 21:02:57 -02:00
LCastr0
ed8363e1be Added items to infused chests 2017-01-18 20:57:54 -02:00
LCastr0
4cdb652b79 Removed winter items from infused chests 2017-01-18 20:35:17 -02:00
LCastr0
ad9caa68a0 Small change to treasure page 2017-01-18 20:34:16 -02:00
LCastr0
f93794f14d Removed permissions for snr mods to use unlock cosmetics 2017-01-18 20:31:35 -02:00
LCastr0
6ba1901490 Revert "Revered changes to chest page" 
This reverts commit 419c4b1053.
 2017-01-18 01:07:50 -02:00
LCastr0
419c4b1053 Revered changes to chest page 2017-01-18 00:52:36 -02:00
LCastr0
3e16c7fdf0 Added items to love chest (missing win room) 2017-01-17 23:34:16 -02:00
LCastr0
d49e85c21a Corrected chances for love chest 2017-01-17 23:30:29 -02:00
LCastr0
447a1cee18 Removed unused code 2017-01-17 23:28:19 -02:00
LCastr0
09c43ce73b Added love chets to titles tracking 2017-01-17 23:26:09 -02:00
LCastr0
65cc1b598d Change Flame Rings icon 
Fixed issue with buy chest button
 2017-01-17 21:08:38 -02:00
LCastr0
75ede7f823 Fixed present danger display item 2017-01-17 20:21:37 -02:00
LCastr0
27aa682727 Stops players from purchasing the chest 2017-01-17 20:20:17 -02:00
LCastr0
76b356f73c Removed gingerbread chest 2017-01-17 19:24:27 -02:00
Sam
1a580251e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-17 09:51:17 +00:00
LCastr0
cdd1e63989 Ops, are we back in time? Fixed lore saying 2012 instead of 2017 2017-01-17 06:30:47 -02:00
LCastr0
ccd490b41a Added love chest 2017-01-16 21:06:24 -02:00
LCastr0
819741d8ff Removed gadget selection since it will only work during games 2017-01-16 19:55:28 -02:00
LCastr0
a70c8eccc6 Blow a kiss taunt 2017-01-16 19:43:49 -02:00
LCastr0
ddc098649f Cupid Pet 2017-01-16 19:28:06 -02:00
LCastr0
694b2f69b2 Love train mount 2017-01-16 19:02:22 -02:00
LCastr0
ebfd6e5cc5 Use correct way for adding pets to ppc 2017-01-16 04:19:57 -02:00
LCastr0
c571736def Silent villager 2017-01-16 01:57:42 -02:00
LCastr0
9e4f756fe8 Even better way of making pet circle around you 2017-01-15 02:46:44 -02:00
LCastr0
7600cd6e04 Added enderman gun 2017-01-15 00:07:48 -02:00
LCastr0
46552428a4 Make them slower 2017-01-14 23:55:24 -02:00
LCastr0
6e399b10db Increased radius 2017-01-14 23:27:02 -02:00
LCastr0
3d49eb2181 Better way to handle the circle points 2017-01-14 23:21:49 -02:00
LCastr0
2398fbc8c9 Added correct ppc lore 2017-01-14 23:15:41 -02:00
LCastr0
6c75f6e7dc Showing correct icon for pets 2017-01-14 23:12:31 -02:00
LCastr0
fb05a08e91 Merge branch 'develop' into update/true-love-pet 2017-01-14 23:10:20 -02:00
LCastr0
28442abbbd Now using the correct naming... 2017-01-14 23:09:46 -02:00
LCastr0
e03b59bb7c Added love wings to gadget manager 2017-01-14 22:22:17 -02:00
LCastr0
03c2ec56b7 Added love wings 2017-01-14 22:21:38 -02:00
LCastr0
33cb3b74fc Added love doctor morph to gadgetmanager 2017-01-14 22:11:25 -02:00
LCastr0
fa9f895891 Use the correct event 2017-01-14 21:01:18 -02:00
LCastr0
d667524ed9 Love Doctor Morph 2017-01-14 20:50:44 -02:00
LCastr0
2976eab5bf Added particles 2017-01-14 20:06:12 -02:00
LCastr0
8c11f2c4cb Added True Love Pet 2017-01-14 18:57:40 -02:00
cnr
ef53ae5737 Reinstate missing _showInterface check 2017-01-14 13:59:06 -06:00
cnr
5ba3fac58c Check twofactor status instead of interact events 2017-01-14 01:29:37 -06:00
LCastr0
babc72a87c Fixed lore 2017-01-13 23:31:22 -06:00
samczsun
1a5a530133 Fix Evolution crash 2017-01-13 23:30:13 -06:00
cnr
66bff40040 Update StaffServer whitelist 2017-01-13 21:52:02 -06:00
cnr
bb2477676c Add missing diff from PP-Bizon fix 2017-01-13 14:24:48 -06:00
Sam
b55902f853 World events 2017-01-13 17:16:36 +00:00
cnr
d5160bf10b Don't register https scheme in BungeeRotator 2017-01-13 03:07:50 -06:00
cnr
89ccaf4323 Disable hotbar items when authenticating with 2FA 2017-01-13 01:14:31 -06:00
samczsun
a4614fe3b4 Drastically reduce BungeeRotator size (3MB!!!) 2017-01-12 23:23:11 -06:00
samczsun
251eb2e53e Let's be legal 2017-01-12 23:22:40 -06:00
samczsun
e82d1b5885 Remove spigot as a dependency from ServerData 2017-01-12 23:22:39 -06:00
cnr
cdfc19f566 Ignore canceled player interact events 2017-01-12 23:05:34 -06:00
LCastr0
2bb8023b47 Changed chest spawn animation 2017-01-12 18:20:19 -06:00
LCastr0
4a803c1482 Fixed NPE, weapon name is now back at the lore 2017-01-12 18:20:14 -06:00
cnr
8d33a49397 Use a more explicit title for classic MineStrike 2017-01-12 15:59:57 -06:00
LCastr0
85eb38032f Added minestrike chest to treasure hunt track 2017-01-12 18:50:55 -02:00
LCastr0
9385144566 Lowered the cost from 20000 to 10000 2017-01-12 16:52:36 -02:00
LCastr0
353cefe949 Added weapon name after skin name 
Changed lore and icon of MS chest
 2017-01-12 16:36:29 -02:00
Sam
d5be0f5061 Remove args to match new parameters 2017-01-12 18:04:59 +00:00
Sam
3d64319180 Missing commands 2017-01-12 18:03:40 +00:00
Sam
8d47e80066 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-12 18:03:07 +00:00
LCastr0
4b3b7849eb Added MS chest to customer support server 2017-01-12 15:55:15 -02:00
cnr
ac32fbb15e Add StrikeGames to MineStrike NPC's server page 2017-01-12 00:54:59 -06:00
samczsun
132036bd17 Move Constants to common 2017-01-11 20:42:46 -06:00
samczsun
e72d1e51a2 Ignore bypass for testing sever motd 2017-01-11 20:29:37 -06:00
samczsun
39ba03d1b4 Convert to UtilServer.isTestServer 2017-01-11 20:29:36 -06:00
samczsun
19ac8f0c3b Create framework for proper test network 2017-01-11 20:29:36 -06:00
Nate Mortensen
e339b0352a Make GameComponent generic and store an instance of the Game. 2017-01-11 20:04:48 -06:00
samczsun
5c4cc48e86 More QA changes 2017-01-11 19:50:26 -06:00
samczsun
4fd92a3402 Fix remainder of parties bugs 2017-01-11 19:50:26 -06:00
samczsun
56d4ed9e11 Parties rewrite 
Basically everything got changed. Also Portal has a slightly better API
now
 2017-01-11 19:50:26 -06:00
cnr
91773de97e Don't use metadata for two-factor auth 2017-01-11 16:17:03 -06:00
Kenny
6f2705f0e4 Reduce size of bungeerotator jar 
Make use of the maven shade plugin's `minimizeJar` option to filter out
classes not explicitly mentioned, and use two artifact filters to
explicitly include classes used. Also removes the mysql driver check in
the main method as it is not necessary for this program to work.
 2017-01-11 15:46:20 -06:00
cnr
cea08cae67 Merge branch 'update/cosmetics-balloons' into develop 2017-01-11 15:32:41 -06:00
xXVevzZXx
1095f8bc49 Respack links 2017-01-11 15:29:50 -06:00
xXVevzZXx
5a2ed59a38 Make Strike Games an actual game, disable Hunger and remove food from loot 2017-01-11 15:29:50 -06:00
Shaun Bennett
28a83ef722 Don't delete old client when being replaced (solves enjin listener issue) 2017-01-11 15:28:59 -06:00
samczsun
cbe238c83d Don't give book on join 2017-01-11 15:11:57 -06:00
samczsun
716c77451e Update the right titles 2017-01-11 15:11:57 -06:00
samczsun
fbaeffc96e Remove EventHandler annotation 2017-01-11 15:11:57 -06:00
samczsun
99211d5d89 Fix particles 2017-01-11 15:11:57 -06:00
samczsun
cb13fb1ccc 1.8 titles! 2017-01-11 15:11:57 -06:00
samczsun
bcea0044e8 Animated Titles! 2017-01-11 15:11:57 -06:00
Nate Mortensen
e803df6884 Fix Blink ability with Spectators 
When using blink, players are teleported away from other players
within a one block radius of them.  However, if a player happens
to have the exact same position(only can occur when a player is
spectating them), division by 0 occurs, resulting in the player
being teleported to NaN, as any operation with NaN is also NaN.

To fix this, Blink now ignores players in Spectator mode.  This
change could also address the hypothetical scenario where a
spectator is within the one block radius and results in a blinking
player getting teleported in a weird direction.
 2017-01-11 15:07:48 -06:00
Nate Mortensen
9583c7abcb Run Minestrike in Adventure Mode 2017-01-11 15:07:48 -06:00
Nate Mortensen
0bb01d39b6 Fix PP-Bizon skin 2017-01-11 15:07:48 -06:00
Nate Mortensen
afaed17071 Fix kill reward for skinned knives 2017-01-11 15:07:48 -06:00
Nate Mortensen
e1aeaa8714 Add damage metadata system to CombatLog and CustomDamageEvent 
This adds a system whereby plugins can associate metadata with individual
damage events and then retrieve that metadata later from the CombatLog.
One example use case for this is Minestrike.  Players are rewarded according
to the weapon that they used to kill another player, however the weapons
are frequently renamed.  Minestrike can now associate a "gunType" key
to the name of the weapon used to kill the player, regardless of the skin
that the gun currently has applied to it.
 2017-01-11 15:07:47 -06:00
Nate Mortensen
8384c47e53 Create Lifetime system for managing Listeners with a defined duration. 
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details.  Currently the main two Component types are ICommand and
ListenerComponent.

This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered.  This change allows for
Wizards to be run more than once on the same server instance.  Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.

This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly.  These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.

Finally, this commit adds in changes to the pom to allow for unit testing.
 2017-01-11 15:07:47 -06:00
LCastr0
0a655932af IntelliJ removed an import after I commited last time 2017-01-11 15:50:53 -02:00
LCastr0
5e85f48c87 Fixed balloons still being added to chests 2017-01-11 01:54:53 -02:00
LCastr0
21473a7d82 Fixed merge conflict 2017-01-10 21:27:47 -02:00
LCastr0
d3e6a094e5 Removed balloons for now, will be in the next update 
Updated cosmetics menu
Added weapon name to skin lore
 2017-01-10 21:08:03 -02:00
Sam
64026f81ff Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-08 21:12:28 +00:00
Sam
0218965bee Villager trading and loot upgrades 2017-01-08 15:44:04 +00:00
cnr
990c548e7b Disable Thanksgiving chickens 2017-01-06 01:06:10 -07:00
cnr
cbc5ed491c Check two-factor status for every player on login 2017-01-05 19:16:28 -07:00
cnr
96c15376aa Use default 2FA window size (3) 2017-01-05 15:20:10 -07:00
cnr
435abbba08 Allow builders to use 2FA 2017-01-05 10:48:56 -07:00
cnr
a2472f45b4 Cancel commands when authenticating with 2FA 2017-01-05 10:44:03 -07:00
cnr
fa6a60981c Return to normal hub type 2017-01-04 20:36:16 -07:00
cnr
f08068c717 Revert "Enable double XP + gems for the holidays" 
This reverts commit d3bcc77e01.
 2017-01-04 20:34:09 -07:00
cnr
3af401ee8f Implement two-factor authentication 2017-01-04 20:33:09 -07:00
Sam
571840e249 Lots more changes 2017-01-02 14:40:13 +00:00
LCastr0
17bdfe6814 Started on the flying mechanics stuff 2016-12-30 12:44:49 -02:00
LCastr0
1aca03b22d Added balloons to normal chests 2016-12-30 12:17:52 -02:00
LCastr0
ef7bbfe7eb Added Balloons to omega chest 2016-12-30 12:10:26 -02:00
LCastr0
9578864f8a Added display item 2016-12-29 21:49:20 -02:00
LCastr0
9ec8835374 Fixed block balloons! 2016-12-29 21:40:02 -02:00
LCastr0
16e40c2896 Added shotgun skin 2016-12-29 19:18:09 -02:00
LCastr0
fcec0399cd Added remaining skins to chest 2016-12-29 19:08:31 -02:00
LCastr0
5f0de2e5e3 Allows 2 chests to be opened and dupes for minestrike chest 2016-12-29 18:04:24 -02:00
LCastr0
c877f20031 Added other skins, forgot this on the last commit 2016-12-29 18:00:18 -02:00
LCastr0
025a43b519 Added ms skins to their own chest, and added chest to page 2016-12-29 17:58:48 -02:00
LCastr0
36303a0fe8 Added new minestrike skins (some, at least?) 2016-12-29 17:43:50 -02:00
LCastr0
8131656ae2 Changed RankReward to have Eternal rank 2016-12-29 17:06:07 -02:00
LCastr0
7f7f3b9954 Removed thanksgiving chickens 2016-12-29 17:01:30 -02:00
LCastr0
4c6298bb63 Merge branch 'develop' into update/cosmetics-balloons 2016-12-29 16:28:13 -02:00
LCastr0
6478656501 Fixed armorstand balloon types 2016-12-29 16:25:20 -02:00
Sam
0ba22f9201 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-28 22:33:04 +00:00
cnr
efea2b0c1d Merge branch 'feature/dinnerbone-morph' into develop 2016-12-28 15:19:06 -07:00
cnr
c7d5e149f8 Fix NullPointerException in speed builders 2016-12-28 15:18:59 -07:00
Sam
4f497a2025 Rank rewards 2016-12-28 18:48:19 +00:00
Sam
4c7f5c5716 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-27 18:59:03 +00:00
Sam
e114ab03b5 Chest spawning 2016-12-27 17:20:53 +00:00
Sam
3a6cef32a4 Add Gem Hunters as a catagory for the build server 2016-12-26 22:45:18 -07:00
cnr
d3bcc77e01 Enable double XP + gems for the holidays 2016-12-26 22:43:32 -07:00
cnr
0b4d217303 Reduce number of redis requests by communities 2016-12-26 22:34:09 -07:00
LCastr0
c685486086 Fixed some types of entities 2016-12-27 00:58:16 -02:00
LCastr0
5198d64ab8 Added all the balloons! 2016-12-27 00:29:48 -02:00
LCastr0
092cde9973 Renamed to BalloonData 2016-12-27 00:01:42 -02:00
LCastr0
cd70305afb Make leashes not break (WITHOUT packets ;)) 2016-12-26 23:17:04 -02:00
LCastr0
f25c592a6d Removed commented code 2016-12-26 22:20:23 -02:00
LCastr0
78510ffbbf Allows multiple balloons 2016-12-26 22:19:08 -02:00
LCastr0
5e420a20d8 Changed temporary display item so it doesn't bug with 1.11 2016-12-26 20:21:43 -02:00
LCastr0
d19d661c7d Modified pets so they don't make different sounds anymore :toot: 2016-12-26 19:02:35 -02:00
LCastr0
6712ad427b Added bat so players can use items in hand with the leash 
Changed silence method so it works :toot:
 2016-12-26 19:00:11 -02:00
LCastr0
c11755558e Ops, those comments are wrong... 2016-12-26 18:27:01 -02:00
LCastr0
1d2a538fd6 Renamed Balloons page name 2016-12-26 18:23:27 -02:00
LCastr0
b422832276 Fixed Cosmetics menu positions 2016-12-26 18:22:57 -02:00
LCastr0
4ebc82bf1f Added balloons 2016-12-26 18:10:42 -02:00
Sam
a4a039b619 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-25 22:09:03 +00:00
Sam
a1dc9135c8 Sprint work 2016-12-25 22:06:10 +00:00
LCastr0
fb9720c926 Added padding to menu 2016-12-25 16:21:46 -02:00
LCastr0
7e6810e10f Added a balloon to the menu 2016-12-25 16:12:05 -02:00
LCastr0
45d4e5ce6e Added Balloons to the cosmetics menu 2016-12-25 16:01:49 -02:00
LCastr0
246db919d9 Changed permissions for Unlock Cosmetics 2016-12-25 15:35:53 -02:00
LCastr0
de73307754 Added morph to january ppc prize 2016-12-25 15:35:25 -02:00
LCastr0
140da98922 Merge branch 'develop' into feature/dinnerbone-morph 2016-12-25 15:34:00 -02:00
samczsun
10bed92a6a Change morph description 2016-12-24 17:38:29 -05:00
samczsun
fe8823c134 Re-order morphs 2016-12-24 17:38:09 -05:00
samczsun
81d769db5b Fix issues regarding disguising 2016-12-24 14:18:33 -05:00
samczsun
eacbdfdb02 Convert morph to packets 2016-12-24 14:07:41 -05:00
cnr
73cefb69c9 Use redis pipeline for community player statuses 2016-12-24 00:39:59 -07:00
cnr
08d65f3662 Load communities with 4 queries instead of 3n+1 2016-12-23 21:33:17 -07:00
LCastr0
0aec8889fa Added lore 2016-12-23 23:56:43 -02:00
AlexTheCoder
35a9eabf74 Use UUID object instead of String for PlayerStatus and FriendStatus, as well as update CommunityJoinRequestInfo on a task 2016-12-23 18:34:52 -05:00
AlexTheCoder
74a6071d4e Refactor Redis PlayerStatus to use UUID as a key instead of Name, and make communities not force every server to subscribe to join publishes from proxies 2016-12-23 18:03:08 -05:00
AlexTheCoder
4ae21e66c9 Delete new communities if the leader has been transferred a new community during creation 2016-12-23 18:03:08 -05:00
LCastr0
675642a100 Disable on tp and do not allow mounts 2016-12-23 19:53:49 -02:00
LCastr0
9fad633b88 Ops, lava, not water 2016-12-23 19:13:50 -02:00
LCastr0
c0afad0723 Fixed morph with lava, water, void and ender pearls 2016-12-23 18:15:26 -02:00
LCastr0
7f6f3464a1 Fixed chest pages again 2016-12-23 17:48:37 -02:00
William Burns
1e0ba62557 To many typos. 2016-12-23 11:15:46 -07:00
AlexTheCoder
7a482c3386 Implement system to run code when an SQL error occurs, and ensure that duplicate key errors on community creation inform the community creator 2016-12-22 22:32:04 -07:00
AlexTheCoder
ac8d8aa69c Prevent Name value in info classes from being null 2016-12-22 22:32:04 -07:00
AlexTheCoder
0a69562579 Improve communities member page sorter to base on role as well as name and online status 2016-12-22 22:32:04 -07:00
AlexTheCoder
09e711e202 Properly get online player key from redis 2016-12-22 22:32:04 -07:00
AlexTheCoder
8e9336ad23 Make community button refresh with join requests 2016-12-22 22:32:04 -07:00
AlexTheCoder
9acd6b7832 Ensure comparison of ints with == instead of Integers 2016-12-22 22:32:04 -07:00
AlexTheCoder
286a9fe246 Fix various synchronization issues and make community creation load the new community through redis instead of a database call 2016-12-22 22:32:04 -07:00
AlexTheCoder
66c6f66768 Fix threading of community create command and make invite loader run on a LoginProcessor 2016-12-22 22:32:04 -07:00
AlexTheCoder
36f671d944 Use UtilPlayer.message instead of sender.sendMessage to fit standards 2016-12-22 22:32:04 -07:00
AlexTheCoder
e5aaa555b7 Make join request name updating redis-based 2016-12-22 22:32:04 -07:00
AlexTheCoder
56ecab1985 Make community membership updating entirely redis-based 2016-12-22 22:32:04 -07:00
samczsun
a0716ae774 Try to prevent duplicate bans even more 2016-12-22 22:42:07 -05:00
samczsun
1bcbddee87 Remove VL logging for good 2016-12-22 22:32:56 -05:00
LCastr0
6870bf31db Merge branch 'feature/dinnerbone-morph' of github.com:Mineplex-LLC/Minecraft-PC into feature/dinnerbone-morph 2016-12-23 00:53:18 -02:00
LCastr0
4c58e852d0 Fixed a bug with treasure pages after buying a chest 2016-12-23 00:53:01 -02:00
samczsun
bbd695981d Don't summon titles if player is morphed 2016-12-22 21:06:39 -05:00
cnr
df5c53766c Disable VL logging 2016-12-22 17:54:50 -07:00
cnr
ca19840b19 Revert "Disable communities temporarily." 
This reverts commit 6d5d2b551b.
 2016-12-22 16:50:35 -07:00
cnr
2fe9423196 Remove inner query in CommunityRepository 2016-12-22 16:44:26 -07:00
LCastr0
7322e05ac4 Added the custom display item to menus 2016-12-22 18:58:38 -02:00
LCastr0
38e9daa377 Added display item feature again 2016-12-22 18:23:42 -02:00
LCastr0
ac6440a3c6 Merge branch 'develop' into feature/dinnerbone-morph 2016-12-22 17:09:33 -02:00
Kenny
253c907ba1 Update Anticheat dependency in core 2016-12-22 12:33:27 -05:00
William Burns
6d5d2b551b Disable communities temporarily. 2016-12-22 17:07:36 +00:00
cnr
69670a4b99 Pass accountId at community creation time 2016-12-22 01:17:44 -07:00
LCastr0
09afab39d6 Merge branch 'develop' into feature/dinnerbone-morph 2016-12-22 03:51:40 -02:00
AlexTheCoder
623703cc76 Insert MCS as type Community in redis 2016-12-21 19:31:57 -07:00
AlexTheCoder
65522a364f Update lobby file used by MCS 2016-12-21 19:31:56 -07:00
AlexTheCoder
0b92bc2263 Fix redis host value for MCS 2016-12-21 19:31:56 -07:00
AlexTheCoder
b73e51b345 Fix invites and member data loading communities from the wrong regions 2016-12-21 19:31:56 -07:00
AlexTheCoder
d4904fa02a Fix communities commands having incorrect coloring in their help messages 2016-12-21 19:31:56 -07:00
AlexTheCoder
d0c2906467 Fix community invites storing twice in player data if it is a duplicate 2016-12-21 19:31:56 -07:00
AlexTheCoder
1190d4a427 Fix communities queries having the ability to lock the server mysql connections due to nesting, improve RepositoryBase by allowing all the methods to be passed a Connection object to reuse it, and fix duplicate invites throwing an sql error 2016-12-21 19:31:56 -07:00
AlexTheCoder
cc3842f019 Synchronize BrowserIds List and update the browser GUI when a contained community is disbanded 2016-12-21 19:31:56 -07:00
AlexTheCoder
941b33bcfc Replace Integer == with Integer.intValue() == so as to avoid edge case errors 2016-12-21 19:31:56 -07:00
AlexTheCoder
1cb6151817 Allow CUST-1 to set players to ETERNAL via support commands 2016-12-21 19:31:56 -07:00
AlexTheCoder
dad7346313 Fix incorrect placement of thankful chest on cust server display 2016-12-21 19:31:56 -07:00
AlexTheCoder
07f2679275 Fix preference ordinal being shifted due to community invite preference being added in the middle, and added region-locking to community names so as to stop EU and US communities from having the same name due to independent redii 2016-12-21 19:30:54 -07:00
AlexTheCoder
eabda7f8c6 Fix alpha numeric check and slight potential concurrency issues 2016-12-21 19:30:54 -07:00
AlexTheCoder
bcbc6fdea4 More fixes and stylistic changes from iteration 2016-12-21 19:30:54 -07:00
AlexTheCoder
92e5c74fff Update PersonalServerManager to launch the MCS with the community's favorite game 2016-12-21 19:30:54 -07:00
AlexTheCoder
94d8e5d2f4 Update Formatter to support specifically colored commands 2016-12-21 19:30:54 -07:00
AlexTheCoder
8bb279a8fb Remove game tips from MCS 2016-12-21 19:30:53 -07:00
AlexTheCoder
2611ba7a7a Bugfixes from iteration, & new features requested by sampson sigils and relyh 2016-12-21 19:30:53 -07:00
AlexTheCoder
2cacbcbc1c Update community repository to latest changes 2016-12-21 19:30:27 -07:00
AlexTheCoder
df3c2d5d67 Fix champions being permanently disabled 2016-12-21 19:30:27 -07:00
AlexTheCoder
1a3a48115c Set up personal server manager to be able to create an MCS 2016-12-21 19:30:27 -07:00
AlexTheCoder
095fbfa255 Fix error caused by GIT client with MCS themes and actually register redis commands in the miniplugin 2016-12-21 19:30:27 -07:00
AlexTheCoder
cbe1a617af Support the MCS in Arcade 2016-12-21 19:30:26 -07:00
AlexTheCoder
fe62e5a683 Make server monitor support MCS and servers with multiple '-' characters 2016-12-21 19:30:26 -07:00
AlexTheCoder
bd4fa1f2d4 Convert to MCS system for community servers and add a command to open them 2016-12-21 19:30:26 -07:00
AlexTheCoder
0668e31710 Implement various events to interact with the GUIs and update them when changes to communities or playerdata occur 2016-12-21 19:30:26 -07:00
AlexTheCoder
024a58e0fa Create data classes to handle information about join requests and community members, as well as increasing the amount of information held for online players in their MemberData 2016-12-21 19:30:26 -07:00
AlexTheCoder
cefc3344ab Set up redis pub sub commands to transfer communities information across the network 2016-12-21 19:30:26 -07:00
AlexTheCoder
39f2c94718 Update the Communities miniplugin to contain a variety of redis and player interaction 2016-12-21 19:30:26 -07:00
AlexTheCoder
2a971d616c Complete setting up community data class 2016-12-21 19:30:26 -07:00
AlexTheCoder
471ea8942f Create an enum to manage different unlockable MPS themes 2016-12-21 19:30:26 -07:00
AlexTheCoder
216b4fe947 Further set up communities database class 2016-12-21 19:30:26 -07:00
AlexTheCoder
9ba38ffd3b Implement all communities commands 2016-12-21 19:30:26 -07:00
AlexTheCoder
d44a3774db Implement communities GUI system with several pages for community management 2016-12-21 19:30:26 -07:00
AlexTheCoder
f6362676ff Implement more settings for communities 2016-12-21 19:30:26 -07:00
AlexTheCoder
fd30fca035 Remove an unused preference class and convert friends preferences to social preferences so as to add communities preferences in that section 2016-12-21 19:30:26 -07:00
AlexTheCoder
88fc34def4 Implement a setting to configure whether a game type can be the favorite game of a community 2016-12-21 19:30:25 -07:00
AlexTheCoder
482f0e5b2a Implement a method for loading client data from the web server for offline uuids 2016-12-21 19:30:25 -07:00
AlexTheCoder
1a0bd7ffb0 Set up more settings 2016-12-21 19:30:25 -07:00
AlexTheCoder
7b23c1bdd2 Change SQL queries a bit to be more efficient 2016-12-21 19:30:25 -07:00
AlexTheCoder
a2fb0bb491 Implement more backend for communities and add a command base 2016-12-21 19:30:25 -07:00
AlexTheCoder
0007ffc91e More backend for handling community settings 2016-12-21 19:30:25 -07:00
AlexTheCoder
5143a7cd61 Change/Expand redis interaction and community storage, implement chat formatting 2016-12-21 19:30:25 -07:00
AlexTheCoder
ac224e3f68 Initial communities code 2016-12-21 19:30:25 -07:00
LCastr0
dd9729c0f4 and! 2016-12-21 15:55:52 -07:00
LCastr0
e8d698ac37 Fixed eternal taunt 
Added description for taunts
Added eternal taunt description and icon
Removed minestrike chest for now
Removed debug commans permissions
 2016-12-21 15:55:52 -07:00
LCastr0
f2aef9a873 Auto-add item to eternal 2016-12-21 15:55:52 -07:00
LCastr0
dd7f5d7513 Disguise player as skeleton 2016-12-21 15:55:52 -07:00
LCastr0
5102227e94 Added time in ticks where players can't move at the start of the effect 2016-12-21 15:55:52 -07:00
LCastr0
651d0c5966 Changed clocks to be behind player 2016-12-21 15:55:52 -07:00
LCastr0
36801283d7 Added method to disable taunts in certain games 2016-12-21 15:55:52 -07:00
LCastr0
f9c71c481f Fixed taunts, using armorstands instead of items 
Removed minestrike chest (not being released this month)
 2016-12-21 15:55:52 -07:00
LCastr0
69f7f025a1 Added the first taunt! 2016-12-21 15:55:52 -07:00
LCastr0
e940134610 Removed commented code 2016-12-21 15:55:52 -07:00
LCastr0
99cec0de91 Added pages for the Treasure Chest menu! 2016-12-21 15:55:52 -07:00
LCastr0
e50b867184 Javadocs + option to make taunts usable or not during pvp 2016-12-21 15:55:52 -07:00
LCastr0
0af46005e7 Added Taunts :toot: 2016-12-21 15:55:51 -07:00
LCastr0
56003cccab Added Minestrike Chests tracking for support 2016-12-21 15:55:51 -07:00
LCastr0
8f50f0d833 Added Minestrike chests (this time to the right branch) 2016-12-21 15:55:51 -07:00
samczsun
7e2c4c8555 Change thresholds, add notifs, move stuff around 2016-12-21 15:55:51 -07:00
samczsun
7f3bb9671a Change thresholds, add notifs, move stuff around 2016-12-20 15:05:52 -05:00
samczsun
c4c46b6ba2 Add warning if check does not exist 2016-12-20 15:05:26 -05:00
samczsun
fcaf4538bd Handle multiple bans when ranked TWITCH+ 2016-12-20 15:05:26 -05:00
samczsun
63d0481dcf Fix minor bugs 2016-12-20 15:05:26 -05:00
samczsun
2397cdbba7 Add playerinfo metadata 2016-12-20 15:05:26 -05:00
samczsun
b00d9d7bb4 Prevent punishment abuse 2016-12-20 15:05:26 -05:00
samczsun
383c4d3670 More 2016-12-20 15:05:26 -05:00
samczsun
ece4416c2e Metadata 2016-12-20 15:05:26 -05:00
samczsun
77f1f18f27 More metadata 2016-12-20 15:05:01 -05:00
samczsun
994d286abe More logging 2016-12-20 15:05:01 -05:00
samczsun
74f4645828 Ban log 2016-12-20 15:05:01 -05:00
samczsun
6970c3205e AntiHack Logging 2016-12-20 15:05:01 -05:00
samczsun
77da6ac2c2 Remove MAC 2016-12-20 15:05:01 -05:00
LCastr0
df2b0c7e99 Addef fix for dinnerbone morph not opening menus 2016-12-20 17:16:42 -02:00
Sam
94f8419187 Cashing out and safezones 2016-12-20 16:45:41 +00:00
LCastr0
fd223935c7 Merge branch 'feature/dinnerbone-morph' of github.com:Mineplex-LLC/Minecraft-PC into feature/dinnerbone-morph 2016-12-19 22:15:32 -02:00
LCastr0
06a05080ed Added YearMonth for Dinnerbone Morph 2016-12-19 22:15:22 -02:00
samczsun
b85bd623f7 Fix not updating skin/tab list 2016-12-19 19:14:28 -05:00
samczsun
eadbb22de9 Dinnerbone Morph with tab list 2016-12-19 17:53:15 -05:00
Sam
9409cbc42c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-19 00:32:53 +00:00
samczsun
a6db0170c6 QA Fixes 2016-12-15 20:48:40 -07:00
samczsun
58761a0478 1.8 blocker 2016-12-15 20:48:40 -07:00
samczsun
8421aad59c Multiversion support (but not used) 2016-12-15 20:48:40 -07:00
samczsun
54f59c6a4d This is not a bribe 2016-12-15 20:48:40 -07:00
samczsun
de3eef462a Add Gingerbread Chest to list of holiday chests 2016-12-15 20:48:39 -07:00
samczsun
6ed6c324ec Update Holiday Cheer Hover 2016-12-15 20:48:39 -07:00
samczsun
d43d82d1ad Update Leveler tier names 2016-12-15 20:48:39 -07:00
samczsun
908df5a4c2 Make Love Potion call event 2016-12-15 20:48:39 -07:00
samczsun
84132588c2 Give bonus for melons 2016-12-15 20:48:39 -07:00
md_5
e107c0a64a Pass SQL connection into nested method to prevent deadlock. 
Discussed with Sam on Slack 11 Dec #general.
 2016-12-15 20:46:42 -07:00
William Burns
337f9e4fd9 Don't display titles to 1.8 clients! 2016-12-15 12:36:32 +00:00
cnr
2ab9bc2c88 Fix Power Play title track's goal 2016-12-15 00:44:31 -07:00
cnr
777574a8ff Add missing dependency to BungeeRotator 2016-12-14 23:23:42 -07:00
samczsun
fd00644eb8 Finalize Titles 2016-12-14 19:56:27 -07:00
samczsun
4641ed828b Fix faulty scoreboard logic 2016-12-14 19:54:08 -07:00
samczsun
87eaeabd7f Document and clean up StatsManager 2016-12-14 19:52:13 -07:00
samczsun
d291521ad1 Clean up DonationManager 2016-12-14 19:52:13 -07:00
samczsun
f2fc70f400 Titles 2016-12-14 19:52:13 -07:00
Sam
33ac4f49fd Some progress 2016-12-13 22:39:38 +00:00
Sam
99b69bd8c8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-13 22:39:30 +00:00
Kenny
1b76de9e06 Implement timeout into HTTP calls to prevent freezes 2016-12-12 21:21:06 -05:00
Sam
d0f3aff051 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-10 11:21:20 +00:00
Sam
6367330021 WorldEvent Base 2016-12-10 11:21:19 +00:00
Sam
6bb76db05b Helicopter 2016-12-09 18:05:17 +00:00
LCastr0
77a1b40bef Fixed illuminated chests having gadgets 2016-12-08 20:46:14 -07:00
cnr
b7e738b4e8 Revert commits from #302 
This reverts commits from the range 062fdd3^..a0beeab

Changes from #302 are on hold until a later date.
 2016-12-08 20:41:46 -07:00
Sam
58613fa77f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-08 19:42:55 +00:00
Sam
b6173c4990 Google Sheets implementation 2016-12-08 19:25:48 +00:00
LCastr0
38345bfc6d Add Infused chests #308 2016-12-07 21:42:44 -06:00
Nate Mortensen
a0beeab5ec Fix Frost Barrier not activating 
Negative yaw values are considered valid in minecraft.
UtilShapes doesn't correctly handle negative yaw values
(throws an ArrayIndexOutOfBoundsException) so whenever
a player is facing east they're unable to activate Frost
Barrier.

This commit fixes the issue by allowing UtilShapes to take
negative values.
 2016-12-07 13:20:04 -06:00
Nate Mortensen
5c363d27fd Fix item drop check in Wizards 
Currently players are unable to drop items if the held item
slot is below 5.  This works fine when dropping items simply
by pressing q, but it often interferes with players dropping
items from an open inventory.  This commit changes the check
to iterate over the first five slots and only cancel the event
if they're dropping one of them.
 2016-12-07 13:20:04 -06:00
Nate Mortensen
107fc9d5f6 Fix Blink ability with Spectators 
When using blink, players are teleported away from other players
within a one block radius of them.  However, if a player happens
to have the exact same position(only can occur when a player is
spectating them), division by 0 occurs, resulting in the player
being teleported to NaN, as any operation with NaN is also NaN.

To fix this, Blink now ignores players in Spectator mode.  This
change could also address the hypothetical scenario where a
spectator is within the one block radius and results in a blinking
player getting teleported in a weird direction.
 2016-12-07 13:20:04 -06:00
Nate Mortensen
66eeae2a54 Run Minestrike in Adventure Mode 2016-12-07 13:20:04 -06:00
Nate Mortensen
ee6e6837ac Fix the death message when using Summon Wolves 2016-12-07 13:20:04 -06:00
Nate Mortensen
d51d3b2df2 Fix PP-Bizon skin 2016-12-07 13:20:04 -06:00
Nate Mortensen
1a7965a954 Fix kill reward for skinned knives 2016-12-07 13:20:04 -06:00
Nate Mortensen
21ebb2b4c8 Add damage metadata system to CombatLog and CustomDamageEvent 
This adds a system whereby plugins can associate metadata with individual
damage events and then retrieve that metadata later from the CombatLog.
One example use case for this is Minestrike.  Players are rewarded according
to the weapon that they used to kill another player, however the weapons
are frequently renamed.  Minestrike can now associate a "gunType" key
to the name of the weapon used to kill the player, regardless of the skin
that the gun currently has applied to it.
 2016-12-07 13:20:04 -06:00
Nate Mortensen
a05b53c233 Fix Rumble spell slowness level 2016-12-07 13:20:04 -06:00
Nate Mortensen
0c71d5ef5d Fix protection provided by Gold armor in Wizards 
While the name of the gold items is "Golden X", the
name of the material is "GOLD X" resulting in gold items
providing no protective benefit other than the default
vanilla protection(in the case of there being only gold
armor).
 2016-12-07 13:20:04 -06:00
Nate Mortensen
fb15264a69 Correct damage for Fireball and AnvilDrop 
This issue came down to two bugs with the explosions created
by Fireball and AnvilDrop.

The first was the damage being done.  Settings the max damage
doesn't change the base damage, so they did the default amount
of damage based on the vanilla code.

The second was the radius of the explosion.  The radius was
too small, and so it was perceived that only users directly hit
would suffer damage.  The radius was increased, however the block
explosion size was kept the same.
 2016-12-07 13:20:04 -06:00
Nate Mortensen
833c52d0f2 Create Lifetime system for managing Listeners with a defined duration. 
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details.  Currently the main two Component types are ICommand and
ListenerComponent.

This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered.  This change allows for
Wizards to be run more than once on the same server instance.  Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.

This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly.  These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.

Finally, this commit adds in changes to the pom to allow for unit testing.
 2016-12-07 13:20:04 -06:00
Nate Mortensen
062fdd31b2 Allow spells to be learned from double chests 2016-12-07 13:20:04 -06:00
samczsun
3755424b1c Botspam QoL improvements 2016-12-07 13:11:00 -06:00
samczsun
20697982e7 Create Rank ScoreboardTag to fix Name collision 2016-12-07 13:05:54 -06:00
samczsun
9234c7a7d5 Implement AddPunishCommand and RemovePunishCommand 2016-12-07 13:05:54 -06:00
Alexander Meech
3af0fe3bee Add a check for punishment removal permission 2016-12-07 13:05:54 -06:00
Alexander Meech
609d77a4f2 Add a check for whether a player can remove punishments 2016-12-07 13:05:54 -06:00
Sam
05523c1cdf Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-07 13:36:28 +00:00
Sam
19a214b454 Gem Hunters base 2016-12-06 19:28:23 +00:00
Alexander Meech
1ab800afb8 Remove time portion from scoreboard when ending is reached 2016-12-04 01:59:28 -05:00
Alexander Meech
aa3a8104d2 Toggle reached ending setting on last stage 2016-12-04 01:57:57 -05:00
Alexander Meech
d1a084b66e Add a reached ending setting to Christmas Chaos 2016-12-04 01:55:46 -05:00
LCastr0
97ce2d0ae6 Gingerbread Cosmetics 
Adds the following:
- Gingerbread Chests
- Holiday Tree particle
- Freeze Suit
- Winter Warfare win effect
- Present Danger Win Effect
- Gingerbread Man pet
 2016-12-01 23:39:33 -06:00
cnr
0ae158726a Remove last year's 'Massive Winter Sale' news 2016-12-01 03:56:29 -06:00
cnr
795f82d665 Set time to night in the Christmas hub 2016-12-01 03:00:36 -06:00
cnr
fa0e42a918 Revert "Anticheat Logging #299" 
This reverts commit cae9d2f67e.
 2016-12-01 01:59:50 -06:00
LCastr0
e503654114 Added lore and icon for the Santa Morph 2016-12-01 01:54:53 -06:00
LCastr0
420a74a33d Added Santa Morph to the PowerPlay rewards 2016-12-01 01:49:05 -06:00
LCastr0
64949678f8 Added Santa Morph to the menu 
Disabled spawning Baby Zombie Jockey near water
 2016-12-01 01:42:29 -06:00
cnr
cae9d2f67e Anticheat Logging #299 
Remove MAC
Add AntiHack Logging
Change thresholds, add notifs, move stuff around
Add warning if check does not exist
Handle multiple bans when ranked TWITCH+
Prevent punishment abuse
 2016-12-01 01:24:05 -06:00
AlexTheCoder
df741fd394 Fix UtilVariant and disable Thanksgiving Chickens in Christmas Chaos 2016-12-01 01:22:32 -06:00
AlexTheCoder
e8cc23279f Start debugging CC 2016-12-01 01:22:32 -06:00
AlexTheCoder
df48369e70 Revamp original Pumpkin King morph, add a new Christmas King Morph, and make the Christmas King morph the new reward for Christmas Chaos 2016-12-01 01:22:32 -06:00
AlexTheCoder
58fe232520 Fix redis pubsub for SalesAnnouncements 2016-12-01 01:20:18 -06:00
AlexTheCoder
72669c7640 Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff 2016-12-01 01:20:18 -06:00
AlexTheCoder
3a7ff872d6 Update Rune Amplifier display to be less confusing 2016-12-01 01:20:18 -06:00
Sam
6d1c368452 Fix no drops 2016-11-30 20:23:45 +00:00
Sam
a7143897a0 Vertical Border and achievements fix 2016-11-30 19:52:27 +00:00
Sam
60c1d747c5 Remove PackMaster Achievement 2016-11-30 17:37:50 +00:00
Sam
bb7191504c UHC Achievements 2016-11-26 00:40:19 +00:00
Sam
ddab450c8e Another border size problem... 2016-11-25 00:44:13 -05:00
Sam
f2eb1209db Wrong border size 2016-11-25 00:44:13 -05:00
Sam
4158d09106 UHC Bug fixes! 2016-11-25 00:44:13 -05:00
AlexTheCoder
6fefd71bb8 Remove all chickens on game state change and stop chickens spawning in any UHC type 2016-11-25 00:41:47 -05:00
AlexTheCoder
26262479f6 Remove Smoke Bomb and Illusion from Clans 2016-11-25 00:41:47 -05:00
cnr
3f72ded65e Revert "Retry CTF proxy fix" 
This reverts commit 67a663891e.
 2016-11-24 06:49:26 -06:00
cnr
5e218d019c Set view distance before loading UHC worlds 2016-11-24 04:50:54 -06:00
Shaun Bennett
f6bf316afb Update rank colors 2016-11-24 04:58:03 -05:00
Shaun Bennett
4ffe9ef220 Disable UHC in player servers (temporary) 2016-11-24 04:57:21 -05:00
Shaun Bennett
8ffe76c2d0 Fix Bonus Rewards for Omega/Illumination 2016-11-24 02:41:58 -05:00
Shaun Bennett
192273314f Merge remote-tracking branch 'origin/develop' into develop 
* origin/develop: (37 commits)
  Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager
  Fix SkyWarrior Kit
  Undo my report changes
  Set up support server with Thankful Chest tracking and Eternal Rank
  Add Cake Mount and implement it in Thankful Chest
  Use getName() instead of a String
  Enable MountChicken with some small modifications and add it to Thankful Chest
  Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
  Remove MCL and OITQP from the stats page
  Take a second crack at fixing invisibility across Arcade and Clans
  Properly block placement of redstone-based blocks in Clans
  Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
  Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
  Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
  Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group
  Fix HolidayManager being outdated
  Update Enderchest endpoint location
  Setup enderchest API
  QA changes
  More bugs
  ...
 2016-11-24 00:51:46 -05:00
AlexTheCoder
be4627812b Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager 2016-11-24 00:51:28 -05:00
Shaun Bennett
8d9f697bdd Fix SkyWarrior Kit 2016-11-24 00:50:03 -05:00
Shaun Bennett
8882bfee5c Merge remote-tracking branch 'remotes/origin/develop' into update/uhc-moppletop 
* remotes/origin/develop:
  Set up support server with Thankful Chest tracking and Eternal Rank
  Add Cake Mount and implement it in Thankful Chest
  Use getName() instead of a String
  Enable MountChicken with some small modifications and add it to Thankful Chest
  Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
  Remove MCL and OITQP from the stats page
  Take a second crack at fixing invisibility across Arcade and Clans
  Properly block placement of redstone-based blocks in Clans
  Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
  Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
  Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
  Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group

# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2016-11-24 00:48:15 -05:00
Shaun Bennett
86591cf4a3 Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop 
* origin/update/uhc-moppletop:
  Fix HolidayManager being outdated
 2016-11-24 00:15:03 -05:00
Shaun Bennett
b291090ace Undo my report changes 2016-11-24 00:14:56 -05:00
AlexTheCoder
e85ee39ac5 Set up support server with Thankful Chest tracking and Eternal Rank 2016-11-23 23:43:42 -05:00
AlexTheCoder
a669ac4105 Add Cake Mount and implement it in Thankful Chest 2016-11-23 23:43:42 -05:00
AlexTheCoder
31fd148487 Use getName() instead of a String 2016-11-23 23:43:42 -05:00
AlexTheCoder
c028edb064 Enable MountChicken with some small modifications and add it to Thankful Chest 2016-11-23 23:43:42 -05:00
AlexTheCoder
cfa5512141 Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward 2016-11-23 23:43:42 -05:00
AlexTheCoder
ca68b59ba2 Remove MCL and OITQP from the stats page 2016-11-23 23:41:10 -05:00
AlexTheCoder
0a458c150f Take a second crack at fixing invisibility across Arcade and Clans 2016-11-23 23:41:10 -05:00
AlexTheCoder
e4a968759a Properly block placement of redstone-based blocks in Clans 2016-11-23 23:41:10 -05:00
AlexTheCoder
32c9900069 Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable 2016-11-23 23:41:10 -05:00
AlexTheCoder
18992efa5a Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation) 2016-11-23 23:41:10 -05:00
AlexTheCoder
c2de8c35e2 Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI 2016-11-23 23:41:10 -05:00
AlexTheCoder
1bbabe46f7 Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group 2016-11-23 23:41:10 -05:00
AlexTheCoder
44efedbc81 Fix HolidayManager being outdated 2016-11-23 19:11:44 -05:00
Shaun Bennett
15f3b19f8a Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop 
* origin/update/uhc-moppletop:
  Retry CTF proxy fix
  Eternal Giveaway Fixes
  Eternal giveaway refactoring
  Revert: Disable Fated giveaway tools for now
  Eternal Rank

# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
 2016-11-23 18:11:26 -05:00
Shaun Bennett
bfa27f2bc4 Update Enderchest endpoint location 2016-11-23 18:10:59 -05:00
xXVevzZXx
b42f3eb5fd Fix final bugs and improve island system 2016-11-23 19:56:46 +01:00
Shaun Bennett
e892476ca0 Setup enderchest API 2016-11-22 08:17:24 -05:00
Sam
325c0ab56c Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-21 19:13:34 +00:00
Sam
92ed095e92 QA changes 2016-11-18 21:32:02 +00:00
Shaun Bennett
dd7e559a37 Merge remote-tracking branch 'origin/develop' into develop 
* origin/develop:
  Retry CTF proxy fix
  Eternal Giveaway Fixes
  Eternal giveaway refactoring
  Revert: Disable Fated giveaway tools for now
  Eternal Rank
 2016-11-17 22:50:23 -05:00
samczsun
67a663891e Retry CTF proxy fix 
But this time, let's allow deregistration even if it hasn't been
registered by us, because it auto-registered itself
 2016-11-17 22:49:15 -05:00
Shaun Bennett
3d5e61e0f1 Eternal Giveaway Fixes 2016-11-17 21:05:10 -05:00
Shaun Bennett
562d7de1a9 Eternal giveaway refactoring 2016-11-17 21:05:10 -05:00
Shaun Bennett
cdfd030999 Revert: Disable Fated giveaway tools for now 2016-11-17 21:05:10 -05:00
Shaun Bennett
712019b45b Eternal Rank 2016-11-17 21:05:10 -05:00
Shaun Bennett
c080d41dc2 Temp DB fixes 2016-11-17 19:08:32 -05:00
xXVevzZXx
85d6452432 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall 2016-11-17 23:17:24 +01:00
Sam
0ca79f193f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 21:20:28 +00:00
Sam
53b67214fb More bugs 2016-11-17 21:20:00 +00:00
Shaun Bennett
f6a694b4fc Fix Metal Man distribution 2016-11-17 16:18:51 -05:00
Shaun Bennett
10911c9a9c Revert CTF Proxy Fix 2016-11-17 16:17:39 -05:00
Sam
142cf4dd93 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 19:41:47 +00:00
Sam
78a123156a Memory leaks! 2016-11-17 19:38:07 +00:00
xXVevzZXx
26d8fe5e6e Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall 2016-11-17 19:19:28 +01:00
Shaun Bennett
e845f7fca9 Disable Fated giveaway tools for now 2016-11-17 02:13:48 -05:00
LCastr0
b862a30c76 Thanksgiving Cosmetics (#278) 
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* I seriously don't remember what is in this commit, I'm just doing it to
fix the thing with develop...

* Fixed Pet menu
Fixed morph menu
Changed from List to Set

* Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned

* Added Santa Morph
Removed Sleigh Morph
Changed all the cosmetics GUIs to start on the second row, instead of the first

* Changed some stuff from Holiday Manager so now chickens will walk around when spawned

* Added sound effects to Metal Man
Added slowness to Metal Man

* Added new lore for the Metal Man Morph description
Added Stray Morph Ability
Fixed some problems with the Thanksgiving Chickens

* Added Fated giveaway manager and animation
Moved titan and fated giveaway managers to a new package

* Fixed lores for Stray morph and Shulker pet
Changed ability of Stray morph

* Removed Stray and Shulker pet from the menu
Deleted Pet class since it was not being used
Changed position of achievement on the menu
Changed color of chicken's name
Changed colors of Power Play message
Stray morph, Santa morph and Shulker pet are hidden from the menus for now
Removed feathers dropping from chickens, changed them to snow particles

* Added hover ability to Metal Man Morph

* Fixed some stuff on Metal Man
 2016-11-17 02:06:00 -05:00
cnr
db1598f896 Revert 1.11 disguise changes 
Entity type tracking for disguises is now done in our spigot build.
 2016-11-16 23:36:47 -06:00
Shaun Bennett
cbc9aeedc6 Report Feature Improvements (#269) 
Report Feature Improvements
 2016-11-16 22:52:14 -05:00
Shaun Bennett
c250796bdf Fix pom.xml formatting 2016-11-16 22:37:25 -05:00
AlexTheCoder
7d14b6073d Give SlackAPI a valid payload link, fix some display issues with clans nether, fix claiming in clans nether, update coordinates to match new map 2016-11-16 22:37:25 -05:00
AlexTheCoder
5e1fcabe36 Final changes for S2 2016-11-16 22:37:25 -05:00
AlexTheCoder
a8e3a530c1 Prevent safely logging out in shop zones while tagged 2016-11-16 22:37:25 -05:00
AlexTheCoder
4a186a8dec Disable crafting of hoppers 2016-11-16 22:37:25 -05:00
AlexTheCoder
4fc2b875d4 Add a clans map generator to codebase 2016-11-16 22:37:25 -05:00
AlexTheCoder
a219a2d072 Fix TNT breaking bedrock, increase build height and add a minimum chest place height 2016-11-16 22:37:25 -05:00
AlexTheCoder
1535fcc38b Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks 2016-11-16 22:37:25 -05:00
AlexTheCoder
63ef68976c Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective 2016-11-16 22:37:25 -05:00
Sam
22b7ce60eb For sam 2016-11-17 02:56:58 +00:00
Alexander Meech
c21e71606d Fix message line spacing for Prince Artix 2016-11-16 21:42:47 -05:00
AlexTheCoder
b374d728f5 Change playwire button, modify player messages, and fix availability bugs 2016-11-16 21:42:47 -05:00
AlexTheCoder
0070fed6c7 Fix playwire multithreading and convert to new 5-ticket per 24-hour system 2016-11-16 21:42:47 -05:00
AlexTheCoder
824ef685c0 Add missing return 2016-11-16 21:42:47 -05:00
AlexTheCoder
d5f89bb370 Add more blocked commands and move the blocked command handler below the Mineplex command executor 2016-11-16 21:42:47 -05:00
AlexTheCoder
4cb257e84a Tweak blocked commands system 2016-11-16 21:42:47 -05:00
Sam Sun
4709161180 Attempt to fix CTF Proxies (#280) 2016-11-16 21:40:42 -05:00
md-5
735550c157 Use Mineplex Pair Util Class in Halloween 2016 (#274) 
JavaFX is not included in OpenJDK.
 2016-11-16 20:29:33 -05:00
Shaun Bennett
0039b79281 Change Youtube Button Link (#275) 
* Fix possible NPE in Preferences

* Change youtube button link
 2016-11-16 20:23:14 -05:00
Sam
8d6eb13504 Add "%player% is your teammate" in 2 player team games (#273) 
* Add "%player% is your teammate" in 2 player team games

* Add to Team Skyfall
 2016-11-16 20:10:16 -05:00
Sam
684432d7dc Add Rules Command (#272) 
* Added a /rules command

* Remove unused space

* More Spaces!
 2016-11-16 19:59:24 -05:00
Sam
51c7801a9f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-15 20:01:21 +00:00
cnr
70ca2c7964 Add 1.11 support 2016-11-15 13:58:31 -06:00
xXVevzZXx
a74bc71018 fix bugs and make some improvements 2016-11-15 17:04:38 +01:00
Sam
faba1f2369 Forgot the actual UHC class... 2016-11-13 12:35:48 +00:00
Sam
efc73d220f Change how UHC handles time 2016-11-13 12:35:38 +00:00
Sam
07cd716cf7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-13 10:37:21 +00:00
Sam
aa4ef9f4ad Big bugs 2016-11-12 21:50:38 +00:00
Keir Nellyer
6e5db69b0c Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-10 13:52:44 +00:00
Sarah
e71187aa33 Add new Brawl Games (#260) 
* add more Brawl games

* fix some bugs in new brawl games

* fix even more bugs

* Fix some super paintstrike bugs

* Add some Javadoc
 2016-11-09 20:38:49 -05:00
Keir Nellyer
af7557c9b1 When multiple accounts with the same name occur, pick the one that 
logged in most recently
 2016-11-09 01:25:33 +00:00
Nate Mortensen
3b83a9bdc3 Reformat Block Hunt 2016-11-08 10:44:39 -05:00
Nate Mortensen
6db79c3ca5 Remove disguises when players switch to Seeker 2016-11-08 10:44:39 -05:00
Nate Mortensen
0607355ee0 Prevent cloaked players from having their visibility reset 2016-11-08 10:44:39 -05:00
Nate Mortensen
e3b701f948 Don't give infestors an initial disguise 2016-11-08 10:44:39 -05:00
Keir Nellyer
6273996ebe Only set incognito and teleport player when report is hacking or 
gameplay offense
 2016-11-07 15:38:55 +00:00
Sam
6a9648e646 Solo Mode and Faster UHC 2016-11-05 11:06:12 +00:00
xXVevzZXx
af7de62ff7 Fix non upgradeable perks being not unregistered 2016-11-04 06:02:13 -05:00
Keir Nellyer
407ec0d924 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-03 20:11:21 +00:00
xXVevzZXx
d93cdfee8f Add Team stats display for Skyfall 2016-11-02 21:42:53 -05:00
Nate Mortensen
f587445ffc Remove extraneous horses when the game ends 
When players using the horseman kit win a game,
they never die, which is the only time that spawned
horses are removed.  To fix this, at the end of the
game all horses belonging to players that have survived
are explicitly removed, which removes all remaining horses.
 2016-11-02 17:01:17 -04:00
LCastr0
9267a36528 Disable Halloween 2016 (#261) 
* Removed all the halloween related items:
 - Haunted chests can only be opened if player already had ammo
 - Removed Halloween theme from the hub
 - Removed pumpkins from in-game

* Added Halloween items to the Omega Chest

* Fixed weight for items in the omega chest

* Changed Disk to Disc in RewardManager
Changed values for omega rarities

* Final commit (removed win room test command)

* Removed Halloween words from Draw My Thing and Master Builders
 2016-11-02 16:49:31 -04:00
Sarah
afac2aea3f Skyfall Update (#262) 
* Fix some bugs, improve Skyfall and add Skyfall Teams

* re-enable debug

* Fix Perks not being unregistered from the EventHandler

* Remove unused import

* Remove unused imports
 2016-11-02 16:48:44 -04:00
Sam
b122fba97e Fix arrows not getting removed! 2016-11-02 16:48:01 -04:00
Alexander Meech
1f69c204f6 Fix Trick or Treat Chest Logging in Cust Server 2016-11-02 16:47:38 -04:00
Alexander Meech
e73947b9b1 Hotfix pumpling pet being added to Haunted Chest 2016-11-02 16:47:38 -04:00
Keir Nellyer
aaa248833e Don't allow players to have more than 5 open snapshots at a time 2016-11-01 17:21:56 +00:00
Keir Nellyer
828f39536b Don't allow players to have more than 5 open reports at a time 2016-10-31 15:49:15 +00:00
Keir Nellyer
b5ef642f39 Improve getReportHandling code 2016-10-30 22:13:52 +00:00
Keir Nellyer
4971adcfb3 This should be an inner join 2016-10-30 01:53:52 +00:00
Keir Nellyer
e72573d6fd Fix getReports method not checking report cache first 2016-10-30 01:41:28 +00:00
Keir Nellyer
8f07d377f1 Clear report cache after closing message has been sent, prevents 
report cache being cleared and instantly reloaded
 2016-10-30 01:25:06 +00:00
Keir Nellyer
1405aef0c3 Update code to use column creatorId instead of creator 2016-10-30 01:16:40 +00:00
Keir Nellyer
08f113bb99 Various improvements and fixes to report related database queries 2016-10-30 01:58:56 +01:00
Keir Nellyer
ce4672f026 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-29 15:54:13 +01:00
Keir Nellyer
7aa3daca9d PC-1140 Fix various issues with region-locked reports 2016-10-29 15:54:01 +01:00
Keir Nellyer
696a99b872 Refactor some parameter names to make method function more obvious 2016-10-29 15:26:02 +01:00
Keir Nellyer
3dc441d61d PC-1016 Delete snapshots > 30 days and not linked to report in 
cleanup task
 2016-10-29 14:38:16 +01:00
Keir Nellyer
09e5d13b96 PC-1016 Rename column creator to creatorId 2016-10-29 14:27:19 +01:00
Keir Nellyer
eb37c5da2e PC-1016 Create column created to store date time for snapshots 2016-10-29 14:26:16 +01:00
samczsun
07c93606f8 GameChatManager: Check if the game exists 2016-10-28 17:57:25 -04:00
samczsun
873e93747e HolidayManager: Fix CME 2016-10-28 17:57:25 -04:00
samczsun
49c5df6e68 Parties: Check if target is null before inviting 2016-10-28 17:57:25 -04:00
samczsun
1d961c7d81 GamePlayerManager: Don't load kits if offline 2016-10-28 17:57:25 -04:00
samczsun
a7986a0719 Party: Fix NPE 
Filter out members who are no longer online when sending messages
 2016-10-28 17:57:25 -04:00
samczsun
d2a2fdfd46 UHC: Fix NPE 
Players who joined after the gamestate has been set to PREPARE
should not be considered as in the game
 2016-10-28 17:57:25 -04:00
samczsun
a729b03ce7 UtilParser: Handle null lastDamageCauses 2016-10-28 17:57:25 -04:00
samczsun
0c1f6cbedc Rewrite CombatLogModule 2016-10-28 17:57:25 -04:00
samczsun
70ed2e4fbb CompassModule 
Integrate with CombatLogModule
 2016-10-28 17:56:46 -04:00
samczsun
e8becf3819 Op on dev servers too 2016-10-28 17:56:08 -04:00
samczsun
e7b744f527 UHC rewrite 2016-10-28 17:56:08 -04:00
Keir Nellyer
f0f01b74e8 PC-1016 Schedule cleanup task for everyday at 00:00 CDT 2016-10-28 18:13:20 +01:00
samczsun
7a0fba3027 Make Trick Or Treat chests open 4 2016-10-28 00:10:17 -05:00
Keir Nellyer
4b3cadbb5a Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
 2016-10-27 23:53:32 +01:00
Keir Nellyer
8283af25af Remove resolved todo for metrics command 2016-10-27 23:49:40 +01:00
Keir Nellyer
e7ff175eff Remove report site token todo message (is now resolved) 2016-10-27 23:48:54 +01:00
Keir Nellyer
30f56e3b12 PC-1016 Add cleanup task sql script 2016-10-27 23:40:09 +01:00
Keir Nellyer
100dc53ead PC-1150 Close div's correctly 2016-10-27 16:09:11 +01:00
Keir Nellyer
3bcfa6adc5 PC-1150 Only show information section of site when report is being 
displayed
 2016-10-27 15:34:07 +01:00
Shaun Bennett
577e640f4a Add KillAura Type E and F checks - no Action enabled yet 2016-10-26 23:00:47 -04:00
Shaun Bennett
0c0ad5ab13 PPC Items (#252) 
Update/ppc items
 2016-10-26 22:30:58 -04:00
LCastr0
a340f15d63 Fixed changes requested by Shaun 2016-10-27 00:27:50 -02:00
Shaun Bennett
f06325d972 Super Smash Mobs Update (#243) 
Update/ssm
 2016-10-26 22:03:43 -04:00
Alexander Meech
d13387df52 Make trick or treat chest dynamically controlled (#256) 
* Implement trick or treat chest in customer support server

* Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads
 2016-10-26 22:02:46 -04:00
Keir Nellyer
3bd575b718 PC-1153 Improve /reportmetrics usage 2016-10-26 13:29:11 +01:00
Keir Nellyer
79b5439aa4 Small refactoring 2016-10-26 10:50:49 +01:00
Keir Nellyer
a97ad8dd76 PC-1153 Don't allow days argument to exceed 30 days 2016-10-26 10:42:10 +01:00
Keir Nellyer
f5a81f083e Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-26 10:28:13 +01:00
Keir Nellyer
52d001c26e PC-1153 Add /reportmetrics command 2016-10-26 10:28:01 +01:00
Alexander Meech
39f0cd79bb Cap purchase date for sampson 2016-10-25 13:34:22 -04:00
Alexander Meech
3e8eecdf91 Update reward weightings for sigils 2016-10-25 13:34:22 -04:00
Alexander Meech
6d982f3df9 Fix spin ticket reward threading 2016-10-25 13:34:22 -04:00
Alexander Meech
273f95f8ff Fix playwire threading 2016-10-25 13:34:22 -04:00
AlexTheCoder
a36ebf4528 Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads 2016-10-25 13:34:22 -04:00
AlexTheCoder
ab228fb492 Implement trick or treat chest in customer support server 2016-10-25 13:34:22 -04:00
cnr
44e016f272 Fix infinite loop in GameWorldManager 2016-10-25 01:44:07 -05:00
Keir Nellyer
e4c7e31185 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-24 15:00:10 +01:00
Alexander Meech
d6dc750ece Prevent MPS servers with Lobbyblablabla-1 as... 
...the name from being loaded as an applicable lobby server
 2016-10-24 01:21:56 -04:00
xGamingDudex
eaee382e7f Small typo 2016-10-23 16:22:27 +02:00
xGamingDudex
c0ec1e1ff7 Prevent infinite speed effect on creeper 2016-10-23 03:11:51 +02:00
xGamingDudex
7b7b7aadf8 Fix a notorious XP bug in the wolf kit 2016-10-23 01:28:57 +02:00
xGamingDudex
1a847862d5 Prevent sometimes duplicate usage of the snowman smash 2016-10-23 01:28:04 +02:00
xGamingDudex
4531902adc Prevent guardian abilities from affecting team mates 2016-10-23 01:27:34 +02:00
xGamingDudex
0306d0d9d1 Fix chicken rocket to deal damage and knockback 2016-10-23 01:27:09 +02:00
Keir Nellyer
ff8f77f8d1 Rename these variables to make better sense 2016-10-22 23:08:59 +01:00
Keir Nellyer
ecd9dfef1a PC-1139 Update chatsnap site to support displaying of snapshots with 
no associated report
 2016-10-22 20:49:14 +01:00
xGamingDudex
2d0d78e1b7 Prevent snowman smash from affecting self, and give 3 snowmen 2016-10-22 21:28:11 +02:00
Keir Nellyer
c6ca976653 PC-1139 Add /chatsnap command 2016-10-22 20:23:31 +01:00
Keir Nellyer
81bf9bc406 Small method rename 2016-10-22 19:21:38 +01:00
Keir Nellyer
35048b46a7 Report/snapshot code clean-up 2016-10-22 19:17:20 +01:00
Keir Nellyer
e0d05d3c87 PC-1140 Keep reports region-separated 2016-10-22 15:06:18 +01:00
xGamingDudex
295f1f255f Fixed rare NPEs 2016-10-22 13:09:56 +02:00
xGamingDudex
720e965d08 Fixed chicken rocket. 2016-10-22 10:49:21 +02:00
xGamingDudex
4e433665cc Fixed golem smash affecting team mates 2016-10-22 10:49:02 +02:00
xGamingDudex
8414a17978 Don't apply velocity to team mates 2016-10-22 10:48:36 +02:00
xGamingDudex
d2be1fc646 Don't set team mates on fire on direct fireball hit 2016-10-22 10:48:09 +02:00
xGamingDudex
1ae89adfb0 Remove debug messages 2016-10-22 09:40:06 +02:00
LCastr0
6de2df5cc4 Fixed lores 
Fixed icons
Removed sleigh, chicken mount and wind up suit from menus
Added javadocs to sleigh
 2016-10-22 02:27:44 -02:00
LCastr0
83ba1cb26e - Removed debug message 
- Added check for player teleport when opening a chest
 - Added Turkey Morph and Chicken Mount to PowerPlayClubRewards
 2016-10-21 18:48:47 -02:00
LCastr0
0d6ff42a8d - Fixed players not being kicked from treasure chest locations when they are being opened 
- Increased the time needed for the Wind Up suit to be charged
 - Added effect for the Wind Up suit to blink between yellow and red when the effect is active
 2016-10-21 18:06:13 -02:00
Keir Nellyer
5f755add78 Rename /reportstats command to /reporthistory 2016-10-21 17:24:27 +01:00
LCastr0
56db128730 Merge pull request #251 from Mineplex-LLC/develop 
Merge 'develop' into 'update/ppc-items'
 2016-10-21 13:05:00 -02:00
xGamingDudex
cfd2343f0e Fixed zombie perk Deaths Grasp 2016-10-21 16:51:47 +02:00