Commit Graph

10464 Commits

Author SHA1 Message Date
LCastr0 8f117e744e More stuff in ultra effect 2017-05-01 22:14:46 -03:00
LCastr0 e7c171749c Set pitch and yaw for npc 2017-05-01 12:25:03 -03:00
Sam 41b7e4bf38 Fix Zombie's Deaths Grasp hitting spectating players 2017-05-01 14:26:41 +01:00
Sam b89e3c4abc Sheep code cleanup 2017-05-01 14:10:08 +01:00
Sam 0f1cea013c Guardian changes 2017-05-01 14:05:18 +01:00
Sam ff93ca9705 Pig changes 2017-05-01 13:48:49 +01:00
Sam 5138e6ad54 Blaze changes 2017-05-01 13:48:41 +01:00
Sam 76835654e8 Chicken, unless cast 2017-05-01 13:48:32 +01:00
Sam 110d8946d5 Zombie changes 2017-05-01 13:48:09 +01:00
Sam cc3ac9800b Skeletal horse changes 2017-05-01 13:48:01 +01:00
Sam 607893a872 Cow changes 2017-05-01 13:47:52 +01:00
Sam 3c852f091d Witch changes 2017-05-01 13:13:40 +01:00
Sam 69ed0c7c24 Magma Cube changes 2017-05-01 12:07:47 +01:00
Sam 20c05518f3 Wolf changes 2017-05-01 12:07:35 +01:00
Sam 9c9200605a Creeper Sulphur Bomb changes 2017-05-01 11:10:29 +01:00
Sam 1cc9888e58 Creeper Explode damage reduction 2017-05-01 11:10:19 +01:00
Sam 0f925dd655 Ink Blaster changes 2017-05-01 11:10:06 +01:00
Sam 6d4a68acdf Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:41:49 +01:00
Sam 8c2b8935df Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:37:13 +01:00
Sam 6d105a0499 All remaining kits converted to Google Sheets 2017-05-01 10:37:11 +01:00
Sam 0f5fcc7670 Remove entity bots 2017-05-01 10:36:45 +01: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 8ec6ebd060 Fix particles being sent to everyone 2017-04-30 18:42:16 -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 d04e29a473 Tests 2017-04-30 14:46:15 -03:00
LCastr0 0b2d0d348c Merge branch 'develop' into update/mayitems 2017-04-30 13:38:26 -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
LCastr0 95e4170cc1 Added creeper 2017-04-30 11:47:57 -03:00
LCastr0 08150b2c0f Added rank-based win effects 2017-04-30 11:28:40 -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
Sam ee8f970673 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-29 23:40:16 +01:00
Sam acb5963dd4 Balance changes 2017-04-29 23:25:13 +01: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 f8566437d5 Fixed shimmering rings 2017-04-28 21:23:19 -03:00
Sam 8a54e19695 Fix Fissure skipping snow blocks 2017-04-28 19:30:19 +01:00
Sam 6beeec20d6 Disable morphs when changing kits 2017-04-28 19:30:00 +01:00
Sam 26d97bf7eb Up the water damage check rate 2017-04-28 19:29:23 +01:00
LCastr0 df563793c5 Fixed name 2017-04-28 13:25:10 -03:00
LCastr0 adef8945a4 Disable other gadgets before enabling 2017-04-28 13:20:25 -03:00
LCastr0 c1f06595bb Fix NPE 2017-04-28 13:17:00 -03:00
Sam 59699f930e Re-implemented triple jumps 2017-04-28 16:26:02 +01:00
LCastr0 1b686a1446 Shimmering Ring kit selector 2017-04-28 11:43:13 -03:00
LCastr0 89f47d4c6c Rain Cloud selector 2017-04-28 11:20:27 -03:00
LCastr0 42e4564a25 Rainbow Dance selector 2017-04-28 11:14:22 -03:00
LCastr0 e9d1ac85f1 Changed single-type particle to an enum, added love particles 2017-04-28 01:46:26 -03:00
LCastr0 ae8b348264 Ember Kit selector 2017-04-28 01:37:27 -03:00
LCastr0 1000c190a2 Fixed Y offset for Water Wings and added Flames of Fury and Halo effects 2017-04-28 00:32:29 -03:00
LCastr0 494fd4787c Skip disabling kit selectors between game restarts 2017-04-27 23:53:37 -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
LCastr0 e7c270847b Fixed message, and no longer updates without needing 2017-04-27 20:32:46 -03:00
LCastr0 e45e3be4e8 Added first kit selector 2017-04-27 20:01:29 -03:00
LCastr0 95f50604c0 Fixed colors 2017-04-27 18:29:55 -03:00
LCastr0 2615cd6add Fixed locations 2017-04-27 16:56:06 -03:00
LCastr0 d33aac9fd4 Fixed args 2017-04-27 16:34:35 -03:00
LCastr0 246c0c1788 Added wools to the top of the castle 2017-04-27 16:28:09 -03:00
LCastr0 5d5bc2d847 Reverted removal of fountain 2017-04-27 16:06:23 -03:00
LCastr0 6a8cecad27 Javadocs 2017-04-27 15:43:55 -03:00
LCastr0 0942942f5a Changed messages 2017-04-27 15:43:31 -03:00
LCastr0 2e476226fd Javadocs for CastleManager 2017-04-27 15:16:34 -03:00
LCastr0 02785d5dfd Moved everything to CastleManager, changed to rightclick 2017-04-27 15:12:33 -03:00
LCastr0 124d22ce31 Added new class for peasants 2017-04-26 22:52:40 -03:00
Sam 90d173551d Fix not lobby gem duping 2017-04-26 21:56:01 +01:00
LCastr0 6bf1b6c1dc Fixed arguments 2017-04-26 16:25:32 -03:00
LCastr0 4dfd1b3d21 Check for active gadgets while playing the particle 2017-04-26 16:22:24 -03:00
Sam d3cb99f431 Skeletal Horse converted to Google Sheets 2017-04-26 19:11:48 +01:00
LCastr0 5764a4bce3 Added gadget class 2017-04-26 14:34:41 -03:00
LCastr0 01076ec054 Kit selector, not rank selector... 2017-04-26 14:10:49 -03:00
LCastr0 1855cfc4ed Added new gadget type 2017-04-26 13:58:30 -03:00
LCastr0 25487ad0b1 Fix message prefix 2017-04-26 11:17:03 -03:00
LCastr0 fb03e9adec Respawn holograms since setText doesn't work, and actually send the correct information to the event 2017-04-26 11:14:43 -03:00
LCastr0 56f19ec937 Null checker 2017-04-26 01:39:26 -03:00
LCastr0 6145d9f87d Lower the hologram a bit 2017-04-26 01:35:11 -03:00
LCastr0 9796b5acba Actually check if its a hub and start the hologram 2017-04-26 01:26:01 -03:00
LCastr0 19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
Sam 7f1b1d72b9 Chicken converted to Google Sheets 2017-04-25 19:33:00 +01:00
Sam af25aa0b00 Witch converted to Google Sheets 2017-04-25 18:20:34 +01:00
LCastr0 d36b44e32d Removed fountain in my code so I can test the castle 2017-04-25 12:12:51 -03:00
LCastr0 12f7659195 Added king particle 2017-04-25 00:16:32 -03:00
Sam 044a3754cf Fix incorrect key 2017-04-24 23:14:01 +01:00
Sam f16ea648f9 Blazr converted to Google Sheets 2017-04-24 23:13:03 +01:00
Sam 99fa347cf1 Wolf converted to Google Sheets 2017-04-24 20:21:19 +01:00
Sam 27cff85189 Fix Perk variables being overriden when multiple kits used the same perk 2017-04-24 18:04:16 +01:00
Sam 5bc2b9d34c Revert "Make Perks not static, this fixings all kits having the same stats 😨"
This reverts commit 1d0f28689f.
2017-04-24 17:40:48 +01:00
Sam 1d0f28689f Make Perks not static, this fixings all kits having the same stats 😨 2017-04-23 19:06:33 +01:00
Sam c8d891ef31 Snowman converted to Google Sheets 2017-04-23 18:54:29 +01:00
Sam 9e6ab9a696 Enderman converted to Google Sheets 2017-04-23 17:07:45 +01:00
Sam 24b73d27e7 Fix the infinite Giga Slime 2017-04-23 16:10:54 +01:00
Sam 9d48a5f1a5 Creeper converted to Google Sheets 2017-04-23 16:08:45 +01:00
Sam 02ffec8618 Fix players being affected by velocity inside on the spawn island 2017-04-23 14:42:26 +01:00
Sam 09300b499f Adjust the time before the player recieves kit information after death 2017-04-23 14:41:59 +01:00
Sam f1b45bc29e Slime converted to Google Sheets 2017-04-23 14:37:29 +01:00
Sam 43d703d9b7 Spider converted to Google Sheets 2017-04-22 23:53:01 +01:00
Sam 1d7fb77bc4 Deleted some code by accident 2017-04-22 23:10:08 +01:00
Sam e350c62f54 Iron Golem and Skeleton converted to Google Sheets 2017-04-22 23:07:44 +01:00
Sam 82db46c1e6 Displayname fix 2017-04-21 22:52:34 +01:00
Sam 2f478e46f3 Fix various bugs found in testing 2017-04-21 21:53:16 +01:00
Sam f9c98ccf8c Fix persistence? 2017-04-21 20:05:43 +01:00
Sam ac3c1c3ebb Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-21 17:42:46 +01:00
Sam ca6789d92a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-21 17:35:12 +01:00
Sam 01f74a3e12 SSM Training Ground 2017-04-21 17:35:10 +01:00
Sam 30fb899bee Move debug commands over to the proper system 2017-04-20 18:26:22 +01:00
cnr 87b829b411 Disable easter egg baskets in games 2017-04-19 22:33:32 -07:00
cnr ffdbebf3ee Prevent players from purchasing St Patricks Chests 2017-04-19 22:32:21 -07:00
cnr 6bf6725616 Commit missed conflict resolution 2017-04-18 01:40:09 -07:00
LCastr0 61409d0bfe Possible fix for duplicated items in some chests 2017-04-18 01:37:27 -07:00
Alexander Meech bc38d895a0 Update CUST-1 to track Spring Chests 2017-04-16 16:53:18 -04:00
cnr 2263e8bfcb Ignore movement checks in Runner 2017-04-16 01:09:12 -06:00
cnr dad00171a7 Clean up 'banwave' logic 2017-04-16 00:49:12 -06:00
cnr 56e15ab2d9 Add Skyfall teams to game menu 2017-04-14 23:11:15 -06:00
cnr 2baaf4664e Fix UHC and Skyfall player counts 2017-04-14 22:39:06 -06:00
LCastr0 09dc7edaad Added Spring chest to title trackers 2017-04-14 22:34:50 -06:00