Commit Graph

11469 Commits

Author SHA1 Message Date
AlexTheCoder 4c4a3c029e More supply drop fixes, implement new clans items to CUST-1, and fix forum group id assigned to the cmod tag 2017-09-26 05:41:30 -04:00
Sam 35b6f594d4 Trick or Treat Treasure 2017-09-25 18:59:51 +01:00
Sam c86c6547af Halloween Cosmetics 2017-09-25 13:42:38 +01:00
AlexTheCoder 1cdd6c0316 Fix supply drops sometimes dropping beacons if players click too fast 2017-09-24 18:38:49 -04:00
Sam 6797a6506c Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-24 21:25:07 +01:00
Sam ff54aab560 More hub changes 2017-09-24 21:25:04 +01:00
AlexTheCoder 99faf8bdd9 S4 post-release changes 2017-09-23 23:20:38 -04:00
AlexTheCoder 22620bf159 Fix spawn locations for new map 2017-09-23 06:54:43 -04:00
AlexTheCoder e4da5e5592 Final tidying up 2017-09-23 06:11:03 -04:00
AlexTheCoder 1e2dce46ad Tidy up issues from merge 2017-09-23 04:50:02 -04:00
AlexTheCoder 333c632030 Finishing touches 2017-09-23 04:15:07 -04:00
AlexTheCoder 128e16cbcd Add missing safe log qualifications 2017-09-23 04:15:07 -04:00
AlexTheCoder 010b85d1c3 Fixed merge conflicts 2017-09-23 04:15:00 -04:00
AlexTheCoder de015c0943 Fix Capture Point duration and prevent Undead City chests from respawning 2017-09-23 04:10:37 -04:00
AlexTheCoder 2efe422519 Fixed merge conflicts 2017-09-23 04:10:33 -04:00
AlexTheCoder 73fac33554 Fixed merge conflicts 2017-09-23 04:09:03 -04:00
AlexTheCoder 4df88e0b8e Implement a pvp timer 2017-09-23 04:02:56 -04:00
AlexTheCoder e107c1e6cc Fix a gold setting issue, block certain versions, and implement a bunch more content! 2017-09-23 04:02:56 -04:00
AlexTheCoder badfa76166 Fixed merge conflicts 2017-09-23 04:02:49 -04:00
AlexTheCoder 3fab186c09 Implement supply drops 2017-09-23 04:01:31 -04:00
AlexTheCoder cc0d6fa5ec Restrict placement of saplings and string 2017-09-23 04:01:31 -04:00
AlexTheCoder 2156787ff4 Fixed merge conflicts 2017-09-23 04:01:22 -04:00
AlexTheCoder f13e9cdf61 Clans queue system 2017-09-23 03:58:46 -04:00
AlexTheCoder 0a5dae5857 Fixed merge conflicts 2017-09-23 03:58:40 -04:00
AlexTheCoder 250306302f More tweaks to durability system 2017-09-23 03:56:04 -04:00
AlexTheCoder 8fd19c4fd3 Fixed merge conflicts 2017-09-23 03:55:56 -04:00
AlexTheCoder 8d3c9fdf61 Improvements to do with legendaries 2017-09-23 03:48:11 -04:00
AlexTheCoder 1c37c758d9 Tidy up clans banning system 2017-09-23 03:48:11 -04:00
AlexTheCoder e76c9e55d2 Fixed merge conflicts 2017-09-23 03:48:03 -04:00
AlexTheCoder 8fcf821092 Remove plugin-side regeneration cooldown in favor of a craftbukkit fix 2017-09-23 03:47:10 -04:00
AlexTheCoder 6aea0abc16 Don't send slack alerts from testing 2017-09-23 03:47:10 -04:00
AlexTheCoder 19988a8951 Make panic mode alert appropriate slack teams/channels 2017-09-23 03:47:10 -04:00
AlexTheCoder d623b07187 Nerf scythe of the fallen lord drop rate and ability 2017-09-23 03:47:10 -04:00
AlexTheCoder 51cac3d61c Begin implementing an anti-alting and vpn system 2017-09-23 03:47:10 -04:00
AlexTheCoder a06d2f7212 Fixed merge conflicts 2017-09-23 03:47:05 -04:00
AlexTheCoder 9ad4cd0068 Fixed merge conflicts 2017-09-23 03:46:00 -04:00
AlexTheCoder fce33d3313 Log removals of Clans blacklists 2017-09-23 03:44:32 -04:00
AlexTheCoder 514aced5e0 Patch exploit allowing for merging of Champions Classes in Clans 2017-09-23 03:44:32 -04:00
AlexTheCoder 2a0c9d58af Fix incorrect ordering of mount stat values causing strength and jump to be swapped 2017-09-23 03:44:32 -04:00
AlexTheCoder cf38af5de6 Prevent Runed Pickaxe passive from remaining too long 2017-09-23 03:44:32 -04:00
AlexTheCoder 222dd64bd0 Fixed merge conflicts 2017-09-23 03:44:24 -04:00
AlexTheCoder f487d2f3af Prevent clans from spamming users with invites 2017-09-23 03:42:52 -04:00
AlexTheCoder 1ac59b409b Implement server-side regeneration speed management to nullify the effectiveness of regen hacks 2017-09-23 03:42:52 -04:00
AlexTheCoder bc7401196c Prevent mounts from spawning too close to enemy claims and patch mounts transferring to all servers rather than the server they were obtained on 2017-09-23 03:42:52 -04:00
AlexTheCoder 76e74efced Fixed merge conflicts 2017-09-23 03:42:45 -04:00
AlexTheCoder 0da2691a87 Create panic system to protect official content creators 2017-09-23 03:41:57 -04:00
AlexTheCoder 559c641adc Disable crafting of minecarts to patch minecart phasing 2017-09-23 03:41:57 -04:00
AlexTheCoder bc3637833e Rewrite functionality of Flash and Blink to patch phasing with them 2017-09-23 03:41:57 -04:00
AlexTheCoder 5c3b575c3f Improve UtilBlock and UtilItem api classes 2017-09-23 03:41:57 -04:00
AlexTheCoder 640902169c Remove lava generation from clans maps 2017-09-23 03:41:57 -04:00
AlexTheCoder 567b501dfb Fixed merge conflicts 2017-09-23 03:41:43 -04:00
AlexTheCoder f05fb3d0e0 Fix cloaking conditions being stuck enabled after expiring naturally, fix fissure being able to duplicate blocks with physics (sand, gravel), fix Magnetic Maul pulling mounts allowing users to fly, prevent mount dismounting resulting in players going through walls, and improve visibility system 2017-09-23 03:40:38 -04:00
AlexTheCoder eecf960613 Fixed Merge Conflicts 2017-09-23 03:40:21 -04:00
cnr a419af7224 Temporarily disable FastBow check 2017-09-20 22:49:52 -05:00
Sam 76ae23b56f Start on profiles 2017-09-20 22:21:42 +01:00
Sam c6fa44de11 Move Player Join code around 2017-09-19 19:30:29 +01:00
Sam 5ec2307cc9 Cleanup CustomDataManager 2017-09-19 14:51:37 +01:00
Sam e392b65c68 Document a portion of NPCs 2017-09-19 14:36:32 +01:00
Sam de6ead8b2a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-19 12:38:31 +01:00
Sam eb65a524f5 Improvements to the NPC system 2017-09-19 12:38:12 +01:00
Alexander Meech 96e3c300af Update permissions for xenforo link command (#482) 2017-09-18 23:58:32 -05:00
Sam f7ae9ba982 Complete animations for the 3 old chests 2017-09-18 20:52:38 +01:00
Sam efc1ffe9db Finish off Old Chests 2017-09-18 12:19:02 +01:00
Sam 5dcad31240 Fix compilation 2017-09-16 23:35:31 +01:00
Sam fd75b53bcc Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-16 23:33:43 +01:00
Sam 2b4e9e62e1 The mess that is now this 2017-09-16 23:33:42 +01:00
Sam 61541c130f Don't get cosmetic data if cosmetics have been disabled 2017-09-13 22:59:19 -05:00
Sam 52adaf45a2 Only disable costumes 2017-09-13 22:59:19 -05:00
Sam 134039bf79 Revert "Revert "Disable gadgets if the game is in progress""
This reverts commit d3ae579317cc8db79e65468c0a5f85979d82ba37.
2017-09-13 22:59:19 -05:00
Sam fba7997549 Revert "Disable gadgets if the game is in progress"
This reverts commit c03a0c859bbeaedb2640c2d6d927d40e42374f85.
2017-09-13 22:59:19 -05:00
Sam f72c2d4ec0 Disable gadgets if the game is in progress 2017-09-13 22:59:19 -05:00
Sam e51487a949 Actually never mind 2017-09-13 22:59:19 -05:00
Sam 88f842d8b7 Remove the fakeLeashDamage check, causes too many problems 2017-09-13 22:59:19 -05:00
Sam 3362793324 Removed the Bomb Lobbers Jumper cooldown 2017-09-13 22:59:19 -05:00
Sam b8210f5eac Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-12 21:33:20 +01:00
Sam 0458f18843 More hub stuff 2017-09-12 21:33:19 +01:00
cnr 6103c9e3da Fix Strict Mode VL displays 2017-09-11 22:49:00 -05:00
Sam fc258d95b9 Fix infinite slowness 2017-09-11 21:45:00 -05:00
Sam 5ed7be68d9 Fix invincibility 2017-09-11 21:44:53 -05:00
AlexTheCoder 00c8aea422 Fix tracking of Heroes of GWEN chests 2017-09-11 21:44:36 -05:00
Sam 8532f6eca1 New Parkour System 2017-09-11 23:01:29 +01:00
Sam bf82b7c0f4 Disable gadgets when the timer gets below 5 2017-09-10 23:54:10 +01:00
Sam c208dfe103 Cleanup as much of Hub as I can, for now 2017-09-10 18:45:04 +01:00
Sam 2467b7d6ac Fixed bugs 2017-09-10 00:09:17 +01:00
Sam 218484c8d5 Fix PVP stats displaying for everyone 2017-09-09 20:36:47 +01:00
Sam 9d71cd7893 PVP Stats 2017-09-09 18:29:22 +01:00
Sam 30125038b5 UHC Duels hub game 2017-09-09 15:30:52 +01:00
Sam b3c216b7a8 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-09 09:20:08 +01:00
Sam c729857a00 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-09 09:19:46 +01:00
cnr df1c72624c Merge update/moba-cosmetics into develop 2017-09-08 20:50:15 -05:00
Sam 17b986fb6f Ru roh 2017-09-09 02:48:03 +01:00
Sam b698cfe7b4 Fix Rainbow Sheep mount not changing colours 2017-09-09 02:47:35 +01:00
Sam 80817a5e01 Add instance of check for HOG Chest 2017-09-09 02:33:09 +01:00
cnr aac173c105 Merge branch 'update/moba-cosmetics' into develop 2017-09-08 20:31:39 -05:00
Sam c0cda476e4 Complete chest 2017-09-09 02:29:19 +01:00
Sam 9214c809dc Add support for bardolf's werewolf skin 2017-09-08 17:43:39 +01:00
Sam 554aeb6af5 Bug fixes 2017-09-08 16:51:13 +01:00
Sam 81f5f002f0 Typo 2017-09-08 11:24:55 +01:00
Sam 7b1245077f Finish everything 2017-09-08 11:10:24 +01:00
cnr a16442e32c Reduce ban threshold for Killaura type A 2017-09-07 21:32:12 -05:00
cnr 4c3de65734 Enable Anticheat strict mode 2017-09-07 21:21:28 -05:00
Sam 8670f13879 Cache UUID results 2017-09-06 23:41:07 +01:00
Sam 330ed28992 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-06 11:31:53 +01:00
Sam 8724a35269 Tron Hub Game 2017-09-06 11:22:49 +01:00
AlexTheCoder 64c2c65bd0 Fix debug permissions 2017-09-02 20:03:28 -04:00
AlexTheCoder 871f178419 Update ranks sql system to block a race condition and improve performance 2017-09-02 17:08:29 -04:00
cnr b860a69d46 Allow event hosts to use /game 2017-09-01 23:14:26 -05:00
Sam 6542f67d9b Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-02 00:50:24 +01:00
Sam 9b04361c6b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-02 00:45:51 +01:00
Sam 64065f432c Fix loading NPCs from database 2017-09-02 00:43:14 +01:00
Alexander Meech acae54f021 Fix StaffServer rank issues 2017-09-01 14:03:47 -05:00
Alexander Meech 05a7d8d93e Make permissions for /o inheritable 2017-09-01 14:03:47 -05:00
Alexander Meech 51798d5658 Give CMods access to /c x commands 2017-09-01 14:03:47 -05:00
AlexTheCoder f5ae4a7ca5 Fix Rank Location not working due to incorrect UUIDs utilized 2017-09-01 14:03:47 -05:00
Alexander Meech 6f04292b2a Update ResetPlayerCommand.java 2017-09-01 14:03:47 -05:00
Alexander Meech ec67641c22 Add TabListSorter to ClansHubs 2017-09-01 14:03:47 -05:00
Dan Mulloy a8a6e13fa0 Tab list sorting by rank weight 2017-09-01 14:03:47 -05:00
cnr 81110ea4a3 Fix additional rank issues 2017-09-01 14:02:31 -05:00
Sam 87b977706d Fix compilation errors 2017-09-01 17:00:49 +01:00
Sam 02b28ea5b5 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-01 16:57:41 +01:00
Sam f41e94a3f4 Fix compilation errors 2017-09-01 16:57:15 +01:00
Sam 69f7078534 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-01 16:44:58 +01:00
Sam 90d4f9c1f7 Make mounts use permissions 2017-09-01 16:43:43 +01:00
Sam 2b1af7804f Use permissions for NewNPC 2017-09-01 16:41:28 +01:00
Sam 8fa9eec4ce Merge remote-tracking branch 'refs/remotes/origin/feature/leveling' into update/hub-makeover 2017-09-01 16:33:22 +01:00
Sam 39792675dc Hub merges 2017-09-01 16:27:29 +01:00
Sam 07cc9c3646 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-01 16:27:18 +01:00
Sam c520d605bf Forgot Achievement Manager 2017-09-01 16:21:46 +01:00
Sam 7e3e2b9ece Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-09-01 16:21:30 +01:00
Sam cd99700eda Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-01 16:12:51 +01:00
cnr cad44497bd Fix missed compile errors 2017-09-01 00:25:39 -05:00
cnr d4e6860fb0 Accommodate relocatin of guava in spigot 2017-09-01 00:10:51 -05:00
Sam df01074451 Increase animation speed and reduce armourstand amount 2017-08-31 23:21:28 -05:00
cnr a1cca83394 Add FastBow thresholds 2017-08-31 23:21:14 -05:00
Sam bf98437ca3 September PPC Cosmetic 2017-08-31 23:21:04 -05:00
cnr 9faeb955cb Fix rank issues found in testing 2017-08-31 23:15:30 -05:00
Sam 316ad132b4 Bug fixes 2017-08-31 16:08:53 +01:00
cnr 919141f2a7 Merge branch 'develop' into feature/rank-rewrite 2017-08-30 17:42:16 -05:00
Sam 9f24a0ecb9 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-08-30 13:46:07 +01:00
Sam 5bf0159718 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-08-30 13:42:13 +01:00
Sam 8e65a68999 Brand new shiny NPC Manager 2017-08-30 13:38:50 +01:00
cnr 994f957bc3 Eliminate GroupPermission 2017-08-28 13:06:59 -05:00
Sam 9e7e583164 Clearup some cost constants 2017-08-28 16:23:44 +01:00
Sam 4a3e259c8a Minecart collisions 2017-08-26 21:10:58 +01:00
Sam 8e327e86b4 Huge improvement on the Cosmetic System 2017-08-26 16:14:22 +01:00
Sam 2d8bfbf31c Cleanup 2017-08-24 16:19:28 +01:00
Sam 19c65560c5 Remove rotaton on emblems 2017-08-24 11:52:04 +01:00
Sam 9a4995d212 Improve the Level Rewards system 2017-08-23 01:32:27 +01:00
Sam 5b77b099b2 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-22 22:43:33 +01:00
Sam a3afa48549 Remove unused imports 2017-08-22 22:22:48 +01:00
Sam 2b44feb815 Use removeIf instead of an iterator 2017-08-22 22:22:31 +01:00
Sam 6c9b8420b4 September PPC Cosmetic (Win Room) 2017-08-22 20:12:27 +01:00
Sam 930f90fdf3 GH Mount fixes 2017-08-22 20:12:15 +01:00
Sam e412c2cc05 Gem Hunter Mount Skins 2017-08-21 21:11:13 +01:00
Sam fd090a5644 Fix a lot of bugs 2017-08-20 23:04:28 +01:00
Sam 1c86cff6d7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-18 16:51:51 +01:00
Sam c0ed39d9f9 Get emblems to spawn 2017-08-18 16:51:50 +01:00
Sam 01fb5a312f More balance changes 2017-08-18 15:33:31 +01:00
Sam d9a2306f9b Always setMaxHealth from a base of 20 2017-08-17 23:59:38 -04:00
Sam 607d976f0e Change Castle Siege in the game menu 2017-08-17 23:59:38 -04:00
AlexTheCoder 0d7e404da8 Add mute awareness message feature for t3
Tested by t3hero
2017-08-17 23:59:22 -04:00
Sarah 7f6796cff9 Fix Dragon Escape mission 2017-08-17 23:59:04 -04:00
cnr 4a08c3f1d7 Implement requested Anticheat changes
- Reduce speed + glide ban VL to 7500
- Re-enable bans for Killaura type D and Killaura type F
- Re-enable auto-sneak detection and bans
- Disable Killaura type D in MOBA and CS
2017-08-17 00:58:39 -04:00
Sam 849fa93c7c Mount base 2017-08-16 15:00:08 +01:00
Sam 7667bf47c4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-14 16:58:16 +01:00
Sam 9300af8370 Added the Hero Ivy 2017-08-14 16:57:44 +01:00
Sam 456f959a8d Implement Emblems 2017-08-13 15:25:41 +01:00
cnr ab5ee84cb8 Disable KillAura type D 2017-08-12 23:31:35 -04:00
cnr 36bd6af902 Disable movement checks in MOBA and lower Timer threshold 2017-08-12 23:31:09 -04:00
cnr bcf66dc574 Re-enable KillAura type D; disable type F 2017-08-12 23:14:12 -04:00
Sam 4c3a8e267f Titles base 2017-08-12 19:23:07 +01:00
Sam 2000d8ee12 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-11 14:10:29 +01:00
Sam bad25cabd9 Thanks git... 2017-08-10 20:23:09 +01:00
Sam c23c34c346 Only check if they can mount a horses if the games is live 2017-08-10 20:22:56 +01:00
Sam 8135ca022c Actually check that the player is allowed to have the default kit 2017-08-10 20:14:57 +01:00
cnr 987de21b3e Bake permissions ahead of time and prepare GroupPermission refactor 2017-08-10 14:40:26 -04:00
Sam b9640a763c Fix a negative number of defenders shown on the scoreboard. 2017-08-10 19:38:22 +01:00
Sam 0e5fa827fa Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-10 13:51:13 +01:00
Sam edbcb20a80 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-10 13:47:40 +01:00
cnr 54919f8a6c Add 'new updates' text under Castle Siege 2017-08-09 22:53:56 -04:00
Alexander Meech d4071e6de5 Provide access to specific tournament controllers to stop active games 2017-08-09 22:37:38 -04:00
cnr ba8f4e0d5a De-stringify permission groups 2017-08-09 22:26:55 -04:00
AlexTheCoder 99938b4462 Make code compile 2017-08-09 16:32:37 -04:00
AlexTheCoder 482a02fee1 Small fixes 2017-08-09 16:26:55 -04:00
AlexTheCoder aa79e9338d Implement permission requests from admin team 2017-08-09 15:19:48 -04:00
AlexTheCoder 87ac55de44 Unremove server/lobby switcher 2017-08-09 15:19:48 -04:00
AlexTheCoder 9c5e5457f5 Remove hashcode dependence 2017-08-09 15:19:48 -04:00
AlexTheCoder d390a9a492 Fixes from testing 2017-08-09 15:19:48 -04:00
AlexTheCoder ef4aeaaf64 Initial rank rewrite and quest database fixes 2017-08-09 15:19:48 -04:00
Sam b219645722 Set the SplitKitXP in the appropriate games 2017-08-09 02:40:09 +01:00
Sam 137a7565f1 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-09 01:44:28 +01:00
Sam 190293656e Remove old Castle Siege 2017-08-08 21:59:41 +01:00
Sam 0b38b1b6b6 Testing fixes 2017-08-08 21:50:19 +01:00
Sam bb59a03040 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-08-08 19:30:37 +01:00
Kenny Goodin 2d9da9bc3a Merge branch 'bugfix/anticheat' into develop 2017-08-07 15:35:02 -04:00
Kenny Goodin 7995707300 Revert "Update glide and speed violation thresholds to requested values"
This reverts commit 7b6badf87a.
2017-08-07 15:29:58 -04:00
Sam a71c0ecf87 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-08-07 18:10:05 +01:00
Sam 5e0b007180 Prvent Undead Minions from attacking their owner 2017-08-07 18:10:04 +01:00
Kenny Goodin 682b5a8624 Merge branch 'bugfix/anticheat' into develop 2017-08-07 01:54:40 -04:00
Kenny Goodin 7b6badf87a Update glide and speed violation thresholds to requested values 2017-08-07 01:51:57 -04:00