Commit Graph

10277 Commits

Author SHA1 Message Date
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
Sarah 8a33eabe3d Add a way to log commands 2017-04-30 01:38:04 -07:00
Sarah fdee6b1163 Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR 2017-04-30 01:38:04 -07:00
Sam 0bbd0659a0 Fix the water not being replaced bug 2017-04-30 01:38:04 -07:00
Sam fd31706333 5 seconds rather than 50 2017-04-30 01:38:04 -07:00
Sam ee7a29d387 Stop command spam 2017-04-30 01:38:04 -07:00
Sam f315689dda Staff Oscars 2017-04-30 01:38:04 -07:00
LCastr0 e6852d92f2 Fixed item, spawn particles even if player is moving 2017-04-29 13:24:27 -03:00
Kenny 26c772b8b8 Merge branch '2xXP' into develop 2017-04-29 02:19:40 -04:00
Kenny 20264ff1af Clans doesn't have access to this through core for some reason 2017-04-29 02:17:50 -04:00
Kenny 7994ed082e Enable 2x XP 2017-04-29 02:16:31 -04:00
Kenny f5cba1eb1e Rate limit book/sign edits as a temporary measure against a crash exploit 2017-04-29 02:05:07 -04:00
LCastr0 1879a92261 Changed to items... 2017-04-29 01:03:30 -03:00
LCastr0 146274001f Fix height (again) 2017-04-28 22:32:40 -03:00
LCastr0 25adf3fa33 Fix height 2017-04-28 22:04:00 -03:00
LCastr0 0a1a5eae7a Changed arrow to armor stand 2017-04-28 21:37:39 -03:00
LCastr0 073bc2eea7 Update hologram when player claims peasant 2017-04-27 21:18:12 -03:00
LCastr0 55f85966c1 Fixed arrow location 2017-04-27 21:17:05 -03:00
LCastr0 99363d9af5 Lore 2017-04-27 21:06:35 -03:00
LCastr0 16e9263874 Lets the player sit on the throne 2017-04-27 21:05:03 -03:00
LCastr0 d62d9a813b Javadocs 2017-04-27 20:55:21 -03:00
LCastr0 601c9e31c6 Updated hologram to display the amount of peasants in the kingdom 2017-04-27 20:54:49 -03:00
LCastr0 f1670bc550 Increase the height of the crown 2017-04-27 20:33:31 -03:00