Commit Graph

10621 Commits

Author SHA1 Message Date
Sam d107c8d6f4 Bob Ross 2017-05-08 21:09:09 +01:00
Sam 5398bf5e81 More progress 2017-05-07 22:35:15 +01:00
Sam 23d924f137 Kit system 2017-05-06 20:51:49 +01:00
Sam 24dd8a7d2d Merge branch 'feature/moba' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/moba 2017-05-05 22:31:52 +01:00
Sam a32ae91996 Gotta go fast! 2017-05-05 22:30:37 +01:00
cnr b0407cfc51 Send players to normal hubs from Gem Hunters
This changes the behavior of both /hub and update restarts
2017-05-04 12:43:20 -07:00
Sam 3210843395 Capture point fix 2017-05-04 20:20:48 +01:00
Sam 8f01015df9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-04 17:35:41 +01:00
Sam 47c816087e MOBA base 2017-05-04 15:45:04 +01:00
cnr 53eb499236 Use correct region when searching for Gem Hunters 2017-05-04 01:48:05 -07:00
cnr e6c7aa469b Merge branch 'feature/gem-hunters-persistence' into develop 2017-05-03 22:03:29 -07:00
cnr 840b50d56a Disable beta whitelist for open beta 2017-05-03 22:02:02 -07:00
cnr 6fdf926d51 Add temporary(!!) gem hunters server sender
In the near future, with more time, we'll abstract out the MOTD parsing
hackiness from ServerInfo and add the same mechanism to Gem Hunters, so
it gets a ServerNpcPage for free.
2017-05-03 22:02:02 -07:00
cnr 779256e1ca Enable the Skyfall booster kit 2017-05-03 18:45:39 -07:00
Sarah 4da069b244 Fix Booster Kit making you fly 2017-05-03 18:44:53 -07:00
cnr 3d37fab71f Disable movement checks in Dragons 2017-05-03 18:44:05 -07:00
cnr 404733cd34 Disable Speed UHC 2017-05-03 18:42:31 -07:00
cnr 66136a035b Change scoreboard tag for Event Moderator
This ensures that they're sorted next to Sr Mods in the tab list
2017-05-03 18:30:36 -07:00
Sam 4a984f3c41 More fixes! 2017-05-03 22:05:10 +01:00
Sam 3a1fb3cb86 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-05-02 23:17:09 +01:00
Sam 6d8c65ed08 Lots of great fixes 2017-05-02 23:17:06 +01:00
Sam 82ebd28400 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-05-02 21:02:26 +01:00
cnr 2a92d312b2 Merge branch 'update/kingppc' into develop 2017-05-01 22:07:46 -07:00
Sarah 4652b09f78 Change /ea message layout, make /ea not usable by muted players, make /ea not usable without content and fix hub forcefield for event mod 2017-05-01 22:06:30 -07:00
LCastr0 923f991df3 Merge branch 'develop' into update/kingppc 2017-05-02 00:09:19 -03:00
LCastr0 030157fdb5 Fix constructors 2017-05-01 23:18:03 -03:00
LCastr0 b8d2f784c7 Fix NPE, actually call PetSpawnEvent when spawning a pet 2017-05-01 22:19:50 -03:00
cnr e2b43bb995 Don't show holograms in non-lobby servers 2017-05-01 00:49:25 -07:00
cnr d62006a426 Add King item to PPC rewards 2017-05-01 00:45:24 -07:00
cnr e65f269a9a Merge branch 'update/kingppc' into develop 2017-04-30 21:11:37 -07:00
cnr 63fae06831 Revert "Enable 2x XP"
This reverts commit 7994ed082e.
2017-04-30 21:09:11 -07:00
LCastr0 fc5c420176 Changed to update event 2017-04-30 21:19:02 -03:00
LCastr0 734aa920bf Fixed jukebox message 2017-04-30 20:00:29 -03:00
LCastr0 879ab605f1 Set hub as true in Hub 2017-04-30 19:50:45 -03:00
LCastr0 8c64441403 Removed CastleManager from HubManager 2017-04-30 19:41:57 -03:00
LCastr0 a37cf3b1c5 Fixed pets and mounts not having any message when they are inside castle, fixed item despawning, stopped players from placing jukeboxes inside castle 2017-04-30 19:33:38 -03:00
LCastr0 e3521c06fd This shouldn't be there... 2017-04-30 19:14:27 -03:00
LCastr0 5d3dbbb44b Checks for the correct world 2017-04-30 19:06:44 -03:00
LCastr0 9e0424ea46 Checks if it's hub before doing event related stuff 2017-04-30 19:00:53 -03:00
LCastr0 d205d5fada Fixed item being despawned, fixed holograms not being updated, fixed king never being removed on leave 2017-04-30 18:56:37 -03:00
LCastr0 04c0c63390 Fix positions 2017-04-30 18:26:02 -03:00
LCastr0 d88f183726 Fixed bug with gadgets and kings not being updated 2017-04-30 17:52:36 -03:00
LCastr0 49fd8d3941 Fixed item and king not resetting after disabling 2017-04-30 12:52:00 -03:00
LCastr0 3268a49f82 Fixed more conflicts 2017-04-30 12:05:30 -03:00
LCastr0 91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -03:00
LCastr0 28a5a438f5 Fix item being thrown from the throne 2017-04-30 12:02:00 -03:00
cnr 6ae6f7b627 Revert "Rate limit book/sign edits as a temporary measure against a crash exploit"
This reverts commit f5cba1eb1e.
2017-04-30 01:54:43 -07:00
cnr d99f51f3a9 Revert "Clans doesn't have access to this through core for some reason"
This reverts commit 20264ff1af.
2017-04-30 01:54:36 -07:00
Sarah dda09d51e5 Fix Commit 2017-04-30 01:38:04 -07:00
Sarah a0c00e86c4 Implement LoggedCommand into Event Commands 2017-04-30 01:38:04 -07:00