Commit Graph

12212 Commits

Author SHA1 Message Date
Sam
093e4404e4 Fix some weird chat manager code 2017-11-01 22:32:33 -07:00
Sam
5bbc85f821 Make ArcadeManager final 2017-11-01 22:32:33 -07:00
Sam
567773f035 PC-437 2017-11-01 22:32:33 -07:00
Sam
cd85f4434a Remove "Titles are not avaiable in 1.8.x" message 2017-11-01 22:32:33 -07:00
Sam
912c95fa78 Fix missing text stats 2017-11-01 22:32:33 -07:00
Sam
606963180e Remove system print out 2017-11-01 22:32:33 -07:00
Sam
807d977434 PC-1702 2017-11-01 22:32:33 -07:00
AlexTheCoder
eb936662f1 Modify item name check for Clans 2017-11-02 01:23:19 -04:00
AlexTheCoder
96a7a8b0c3 Disable toggle checks 2017-11-02 01:22:50 -04:00
AlexTheCoder
848bee47e3 Disable purchase of 2017 Trick or Treat Bags 2017-11-01 03:04:19 -04:00
AlexTheCoder
adc8c902ae Fix merge conflict 2017-10-30 12:37:26 -07:00
ArcticZeroo
d045dbbf9b Remove the debug in hope that it magically lets the build not fail 2017-10-30 12:37:26 -07:00
ArcticZeroo
530e7c116b Add a bunch of debug to ItemUsable 2017-10-30 12:37:26 -07:00
ArcticZeroo
a216a82515 Attempt to fix issue where any TNT can be used as proximity mines 2017-10-30 12:37:26 -07:00
ArcticZeroo
b39b9da5be Add alias for savemetadata (smeta) 2017-10-26 16:48:39 -07:00
ArcticZeroo
8e1f317f58 Remove additional test server check in AntihackLogger 2017-10-26 16:48:39 -07:00
AlexTheCoder
e73d812feb Decrease delay of GWEN Ban Waves, re-enable GWEN FastBow check, allow GWEN to detect and ban for Reach hacks, and remove permanent banning from GWEN 2017-10-26 19:46:40 -04:00
AlexTheCoder
f7650afb88 Remove in-game facebook rewards 2017-10-22 22:29:16 -04:00
Sam
d29db7da0a Add an Admin command to permanently unlock cosmetics for offline players 2017-10-22 17:53:55 -07:00
Sam
c0dd5f41b5 Add the Tourament MS Skin 2017-10-22 17:53:55 -07:00
ArcticZeroo
4550ffe56e Reply w an error if the player doesn't exist 2017-10-22 17:52:06 -07:00
ArcticZeroo
ccfe7c41d7 Remove test server check in AntihackLogger 2017-10-22 17:52:06 -07:00
Alexander Meech
a251566160 Update CUST-1 Whitelist 2017-10-21 22:33:23 -04:00
Sam
4311d1804b Add Cake Wars build types to the Map Parser 2017-10-19 19:29:25 -07:00
Sam
2fb19e692d Adjust appler kit based on GI balance 2017-10-19 19:28:52 -07:00
Alexander Meech
10e84e677b Enable Halloween words in DMT 2017-10-18 06:01:02 -04:00
Alexander Meech
37ef733d5d Enable Halloween words in Master Builders 2017-10-18 06:00:01 -04:00
Sam
a8d820599a PR comments 2017-10-16 16:36:16 -07:00
Sam
458bb6e1c6 Fix AnicientChests not enabled by default 2017-10-16 16:36:16 -07:00
Sam
9d59f35847 Fix double purchase button 2017-10-16 16:36:16 -07:00
Sam
bf956abcad Paginate TreasurePage 2017-10-16 16:36:16 -07:00
Sam
f76e30d177 Added all old holiday treasure chests 2017-10-16 16:36:16 -07:00
Alexander Meech
7e4129a34a Update HauntedTreasure.java 2017-10-16 16:36:16 -07:00
Alexander Meech
8a5ec5df1a Create LoveTreasure.java 2017-10-16 16:36:16 -07:00
Alexander Meech
378ad50a57 Rename GingerbreadChestAnimation to GingerbreadChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
6381d32bb7 Update ChristmasChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
b6f01fdc76 Create GingerbreadChestAnimation 2017-10-16 16:36:16 -07:00
Alexander Meech
ce02bb124d Create FreedomChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
23a0fce0d2 Create ChristmasChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
80febbc856 Create SpringChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
bda94281cf Create LoveChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
630e1416c9 Update TreasureManager.java 2017-10-16 16:36:16 -07:00
Alexander Meech
791a6a0ebb Update HauntedTreasure.java 2017-10-16 16:36:16 -07:00
Alexander Meech
e7830b3c08 Create HauntedTreasure.java 2017-10-16 16:36:16 -07:00
Alexander Meech
de3d8cf0b3 Update CustomerSupport.java 2017-10-16 16:36:16 -07:00
Alexander Meech
d9e3877ef4 Update TreasureManager.java 2017-10-16 16:36:16 -07:00
Alexander Meech
c4dc30c9d9 Update StPatricksTreasure.java 2017-10-16 16:36:16 -07:00
Alexander Meech
7610a0b2df Update StPatricksChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
0c7cfc560e Create StPatricksTreasure.java 2017-10-16 16:36:16 -07:00
Alexander Meech
83a3283e3f Create StPatricksChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
b197b2a76a Update HubManager.java 2017-10-16 16:36:16 -07:00
Alexander Meech
e36fe72e42 Implement thankful chest 2017-10-16 16:36:16 -07:00
Alexander Meech
4ce92de8b1 Create ThankfulTreasure.java 2017-10-16 16:36:16 -07:00
Alexander Meech
fa3cd284f2 Update ThankfulChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
68917a30f8 Create ThankfulChestAnimation.java 2017-10-16 16:36:16 -07:00
Alexander Meech
7128785199 Fix loot pool for 2016 trick or treat chest 2017-10-16 16:36:16 -07:00
Alexander Meech
e327d63f9a Update UnknownPackageReward.java 2017-10-16 16:36:16 -07:00
Alexander Meech
9be986c2d3 Re-implement a reward for unknown sales packages 2017-10-16 16:36:16 -07:00
Alexander Meech
c56dfee78d Add missing Treasure Types 2017-10-16 16:36:16 -07:00
Alexander Meech
fe6bbc1bdc Implement a more useful error message for missing chest animations 2017-10-16 16:36:16 -07:00
Alexander Meech
f12ee91b79 Fix treasure chests in Clans Hubs 2017-10-16 16:36:16 -07:00
cnr
239bbbd96c Split 2016 and 2017 Halloween Chests 2017-10-13 22:57:30 -07:00
Sam
4680862825 Track trick or treat chests under a unique name 2017-10-13 21:20:32 -07:00
Sam
6819771775 Fix Holiday related titles 2017-10-13 21:20:32 -07:00
Sam
6bc167fca7 Manually open clans ui 2017-10-13 21:20:32 -07:00
Sam
6f4d68087f Fix Eternal get reason 2017-10-13 21:20:32 -07:00
cnr
8fb3bf82f4 Add Holiday Cheer track progress for Halloween games 2017-10-13 18:52:53 -07:00
cnr
bb36e784fa Merge branch 'update/hub-makeover' into develop 2017-10-13 11:34:11 -07:00
cnr
2d173278b0 Allow 1.12.2 clients in Clans 2017-10-13 11:31:07 -07:00
Sam
45494b0d76 Prevent spammy messages when opening chests 2017-10-13 19:21:02 +01:00
Sam
051a0f8809 Fix players being able to open other's chests (check it's the right variable next time) 2017-10-13 19:16:28 +01:00
cnr
169feb1efb Merge branch 'update/hub-makeover' into develop 2017-10-13 09:27:42 -07:00
cnr
be3e150056 Revert "Enable 2x XP for the weekend"
This reverts commit b6d6fbf358.
2017-10-13 09:24:14 -07:00
Sam
cf07417b1f Fix Pumpkin's Revenge crashing on startup 2017-10-13 17:11:43 +01:00
Sam
23118d64a1 Add a sound when spawning the pumpkin mount 2017-10-13 15:44:28 +01:00
Sam
cde4e9dac8 Make sure that the new system can support the old lobby 2017-10-13 15:42:17 +01:00
Sam
029b0606d0 Add all old chest types 2017-10-13 04:34:52 +01:00
Sam
b0b581bb0b Do the same for the entity method 2017-10-12 13:55:04 +01:00
Sam
927078d9f5 Fixed some really bad kit bugs 2017-10-12 13:48:51 +01:00
Sam
c38b4c4490 Fixed serveral bugs 2017-10-08 13:36:42 +01:00
Dan Mulloy
c5e4f8bd38 Fix startup error with Halloween 2016, remove extra debug line 2017-10-07 16:11:12 -04:00
Dan Mulloy
278f17b34d Properly send Halloween sounds in 1.12 and up 2017-10-07 15:39:14 -04:00
Sam
623cd77031 Hub progress 2017-10-04 16:45:02 +01:00
Sam
153d5bdc63 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-10-02 10:52:12 +01:00
AlexTheCoder
285ca1e707 Finish patching issues surrounding supply drops 2017-10-02 01:03:02 -05:00
AlexTheCoder
be3e893b55 Fix some remaining issues with supply drops 2017-10-02 01:02:52 -05:00
Sam
fd5a09e71b Ghast Morph 2017-10-02 01:02:32 -05:00
Sam
017a10ec80 Implement Hub Portals and declutter the hub plugin 2017-10-01 22:11:27 +01:00
Sam
4a9689bd17 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-10-01 14:41:38 +01:00
cnr
2dd42805ef Fix cashout item duplication in Gem Hunters 2017-09-30 22:08:00 -05:00
Sam
f97174528f More halloween stuff 2017-09-30 21:39:53 +01:00
cnr
b6d6fbf358 Enable 2x XP for the weekend 2017-09-29 17:02:09 -05:00
Sam
1b0f2538e0 2017 Minestrike Title 2017-09-29 17:01:27 -05:00
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
Kenny Goodin
ead8377c4f Temporarily disable killaura type D banwave 2017-08-07 01:50:40 -04:00
Sam
18e7143d5a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-05 22:32:34 +01:00
Sam
2b89cc2fb9 Fix heroes unlocking 1 level after they are meant to 2017-08-05 22:15:54 +01:00
Sam
43260c88f5 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-05 22:13:30 +01:00
Sam
ebc198f88a More bug fixes 2017-08-05 22:10:25 +01:00
Sam
1591c1592a Typos 2017-08-05 18:01:35 +01:00
Sam
d5fc1f32c3 Add the tester's UUIDs 2017-08-05 00:06:57 +01:00
Sam
1a671e8356 Add a castle seige title for the testers 2017-08-04 23:41:52 +01:00
Sam
722c858491 Make Kit Progression award XP on all kits used in a game 2017-08-04 21:55:55 +01:00
Sam
e57ab4bf3d Make achievement kits have requirements 2017-08-04 16:19:06 +01:00
Sam
eadfc55ae3 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-08-04 15:52:59 +01:00
Sam
193d3092df Remove unused categories 2017-08-03 11:18:53 +01:00
Graphica
0840153394 Add legacy sales package to flags 2017-08-02 22:38:59 -04:00
Sam
e8b0a1f968 Add HOG Chests to the support server 2017-08-03 01:51:09 +01:00
Sam
b692bf1e75 Make morphs display the current cost 2017-08-03 01:41:52 +01:00
Sam
eb9d13bf15 Fix a bunch of bugs 2017-08-03 01:41:30 +01:00
Sam
c88d609780 New Chest 2017-08-03 00:34:22 +01:00
Sam
3b637ca600 Implement client side shop morphs 2017-08-02 19:56:48 +01:00
Sam
b1bab85934 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-08-01 17:31:36 +01:00
Sam
dea3297da7 Apply the skin to players in game. 2017-08-01 17:25:36 +01:00
Sam
c78eb933b3 Add skins into the UI 2017-08-01 17:00:40 +01:00
Sam
bf940177f9 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-01 13:07:01 +01:00
Graphica
8310849f04 Hide new flags for now 2017-07-31 22:37:49 -04:00
Graphica
2fd67836ad Add missing bold code 2017-07-31 22:37:49 -04:00
Graphica
8c911586dc Clean and document code 2017-07-31 22:37:49 -04:00
Graphica
04f182c745 Add old holiday items into omega chests 2017-07-31 22:37:49 -04:00
Graphica
7c77a89b48 Add ppc and flags to treasure 2017-07-31 22:37:49 -04:00
Graphica
540e450f66 Create melon head morph 2017-07-31 22:37:49 -04:00
Graphica
ab91e3cfd6 Add fruit skin data 2017-07-31 22:37:49 -04:00
Graphica
4b052e111a Add constructor that allows gadget pages to not be built immediately 2017-07-31 22:37:49 -04:00
Graphica
4a7971b843 Add new flag types 2017-07-31 22:37:49 -04:00
Graphica
fbcec02adc Add scrolling to flag cosmetics page 2017-07-31 22:37:49 -04:00
Graphica
488e8af998 Improve flag name formatting 2017-07-31 22:37:49 -04:00
Graphica
c2ab6f9dd4 Allow flags to handle article formatting 2017-07-31 22:37:49 -04:00
Graphica
d24b8a229c Alphabetize CountryFlag data 2017-07-31 22:37:49 -04:00
Graphica
200578df88 Add new flags to CountryFlag enum 2017-07-31 22:37:48 -04:00
Graphica
dadbd87f45 Correctly enable/disable chests 2017-07-31 22:37:48 -04:00
Sam
0777855d9f Community testing feedback 2017-07-31 20:48:36 +01:00
Sam
5aefca3c6c Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-31 19:11:34 +01:00
Sam
7a9c5843fc Get skin data from Google Sheets 2017-07-31 19:11:00 +01:00
Sam
3f47ae6e2e Remove a rouge class 2017-07-31 16:49:08 +01:00
Sam
89e820e442 Remove all GameModifiers and replace them with GameCosmetics 2017-07-31 16:48:56 +01:00
Sam
16daa3f7d8 Add methods to check if a player owns a game cosmetic 2017-07-31 11:52:19 +01:00
Sam
67291804bf Remove old GameModifierPages 2017-07-30 17:08:46 +01:00
Sam
4f6d24dea8 Implement a mini-application inside the Google Sheets module that provides an easy way to get skin data 2017-07-30 16:11:18 +01:00
Sam
c7e4d5b00b Fix NPE 2017-07-29 22:36:25 +01:00
Sam
f198a2f66b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-07-29 22:25:34 +01:00
Sam
3f739a5f22 Finish off morphs 2017-07-29 22:25:33 +01:00
Dan Mulloy
bfee68007c Fix disguise nametags on 1.10+ 2017-07-28 21:57:07 -04:00
Dan Mulloy
c69f67b3e8 Fix skeleton disguises appearing invisible 2017-07-28 17:20:04 -04:00
Sam
a9b4519843 Fix imports and item related bugs 2017-07-28 21:06:03 +01:00
Sam
dd675b407a Add Game Cosmetics and the 4 basic hero morphs 2017-07-28 20:10:10 +01:00
Sam
ebd9986542 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/moba-training 2017-07-27 12:33:09 +01:00
Sam
94ea5c4134 Cosmetic base 2017-07-27 12:33:04 +01:00
Sam
5edfcfa40e Stop training mode from using map specific code 2017-07-27 10:47:14 +01:00
AlexTheCoder
53f28ac26b Add a sound when your king is being damaged 2017-07-26 23:34:01 -04:00
AlexTheCoder
8dcea688ed Add alchemist kit kills achievement 2017-07-26 23:34:00 -04:00
AlexTheCoder
f2e5dfffd9 Change kit description color because joe has OCD 2017-07-26 23:34:00 -04:00
AlexTheCoder
4f8a71cefc Remove bolded text from kill streak reward information 2017-07-26 23:34:00 -04:00
AlexTheCoder
5873075836 Clear potion effects on kit equip 2017-07-26 23:34:00 -04:00
AlexTheCoder
d737b41281 Make the starting Alchemist potions marked Kit Items 2017-07-26 23:34:00 -04:00
AlexTheCoder
d5f56cdb32 Remove Bow from game chests and document bow presence in Archer kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
f8f87a23bc Fix bug causing tnt to not function, increase tnt damage, remove fire resistance from loot pool, and implement Alchemist kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
b672988d31 Nerf Fighter kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
05de024606 Buff Demolitionist kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
bf86c08126 Buff Archer kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
e9c3aebf90 Complete Alchemist kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
3ffd2966b6 Nerf Tank kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
3952fa2e1d Increase amplifier and duration of Castle Assault spawn regeneration and add spawn resistance 2017-07-26 23:34:00 -04:00
AlexTheCoder
9f45d3672d Add Castle Assault to Build Server 2017-07-26 23:34:00 -04:00
AlexTheCoder
66e5339eab Make UtilEnt#GetMetadata infer needed type 2017-07-26 23:34:00 -04:00
cnr
eb566d3363 Remove debug broadcasts 2017-07-26 23:29:07 -04:00
cnr
3fbad35a30 Merge branch 'update/moba-2' into develop 2017-07-26 21:48:15 -04:00
Sam
16744de296 Fix some bugs 2017-07-27 02:35:19 +01:00
Alexander Meech
52341c1550 Update BonusGui.java 2017-07-26 21:29:13 -04:00
Alexander Meech
04491493c2 Update SpecificChannelButton.java 2017-07-26 21:29:13 -04:00
Alexander Meech
2180be2055 Remove Specific creators from BonusManager 2017-07-26 21:29:13 -04:00
cnr
e599f28d34 Modify HotJoiningManager join message 2017-07-26 21:22:16 -04:00
Sam
cd3a90da08 Fix level display for real this time 2017-07-26 20:57:45 -04:00
cnr
5b7f6a94ee Merge branch 'update/moba-2' into develop 2017-07-26 20:27:37 -04:00
Sam
099d2cb132 Cleanup HubVisibilityManager while slowing down the rate at which players are shown other players 2017-07-26 20:26:46 -04:00
Sam
86c733259f Allow double jumping when having hub velocity disabled 2017-07-26 20:26:46 -04:00
Sam
d951089239 Fix the Egg Blaster, Explode disguise bug 2017-07-26 20:25:32 -04:00
cnr
cfc1a29444 Merge branch 'bugfix/disguises' into develop 2017-07-26 20:25:17 -04:00
Sam
a70be6ffd8 Fix level display for real this time 2017-07-26 23:03:48 +01:00
cnr
1fb69edc13 Add Timer ban action @ 15000 VL 2017-07-26 12:40:38 -04:00
cnr
f86664c510 Revert MOBA exp per level to 1000 2017-07-26 12:38:02 -04:00
Sam
ddf0666ba6 Fix level displays 2017-07-25 20:13:50 +01:00
Sam
4f221cabba Fix the NPE that caused MPS crashes 2017-07-25 19:22:11 +01:00
Sam
789658b2d9 Second MOBA map 2017-07-25 17:57:25 +01:00
Sam
84bf321fe5 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-2 2017-07-24 23:14:51 +01:00
Sam
ce95ac481f Bug fixes 2017-07-24 23:03:31 +01:00
Sam
abf51064b3 Implementation of achievements 2017-07-24 20:50:45 +01:00
Sam
e8eb364d99 Fix incorrect descriptions 2017-07-24 15:40:15 +01:00
Sam
23373834a2 Achievement Kits 2017-07-24 15:36:45 +01:00
Dan Mulloy
49c50b027b Attempt to get version strings with /versions
Makes it easier for those who don't know the protocol ;)
2017-07-23 16:26:46 -04:00
Dan Mulloy
99ca371204 Treat magma cubes as slimes and slimes as creatures for disguises
Fixes crashes in 1.12
2017-07-23 16:14:29 -04:00
AlexTheCoder
06a90abc6a Properly store clans tag for sales announcement deletion 2017-07-22 22:21:12 -04:00
AlexTheCoder
8054296d0a Fix incorrect local removal of sales announcements 2017-07-22 20:31:51 -04:00
Sam
115b4487ea Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-22 21:27:24 +01:00
Sam
66fdd9be9f Skeleton mode 2017-07-22 14:24:29 +01:00
AlexTheCoder
5ccc599ef1 Clean up anticheat clans blacklist reason 2017-07-21 22:34:35 -04:00
AlexTheCoder
d8d1ee7832 Fix anticheat banning in clans 2017-07-21 22:31:23 -04:00
AlexTheCoder
a29cff2db1 Properly block Scythe healing when hitting teammates 2017-07-20 16:52:49 -04:00
cnr
e5e0fd8eda Halve exp requirements for leveling in MOBA 2017-07-20 01:03:03 -04:00
cnr
d5d21a3fab Disable anticheat checks in event servers 2017-07-20 01:00:37 -04:00
cnr
2c0d460357 Add Timer check (no bans enabled) 2017-07-20 00:55:14 -04:00
Sam
8b6f79a5ee Delay persistence data get 2017-07-20 00:32:50 -04:00
Sam
8516a98087 Lots of bug fixes 2017-07-20 00:32:42 -04:00
Dan Mulloy
fb28a953e6 Hide players from staff if the staff are also at the spawn point 2017-07-20 00:32:33 -04:00
Dan Mulloy
2c997935c9 Rewrite spawn meta for all living entities on 1.10 and up 2017-07-20 00:32:14 -04:00
Dan Mulloy
7836e0aaaa Fix guardian disguises
This commit fixes guardian disguises (esp. elder guardians) and also provides for disguises to modify packets before they're sent if necessary
2017-07-20 00:32:14 -04:00
Dan Mulloy
8b39fa4e24 Perform disguise validation before doing any of the disguise work
If a disguise is invalid, we won't notify redis or prevent players from joining
2017-07-20 00:32:14 -04:00
AlexTheCoder
ac2df004f0 Fix players being combat tagged after respawn 2017-07-17 19:00:03 -04:00
AlexTheCoder
4f04d879ab I'm a dumbo, and remove the ability to add runes to the Scythe of the Fallen Lord 2017-07-17 18:36:59 -04:00
AlexTheCoder
9daa46bb4a Unify combat tag checking 2017-07-17 13:57:38 -04:00
AlexTheCoder
d5355ab757 Despawn mounts on chunk unload and clean up some formatting 2017-07-17 13:57:38 -04:00
AlexTheCoder
5e70ff8471 Block sleeping in beds 2017-07-17 13:57:38 -04:00
AlexTheCoder
8379c6235b Lower freeze walk buffer 2017-07-17 13:57:38 -04:00
AlexTheCoder
46768c60ec Disable all other magmus abilities while heat room is active, and make the heat room safezone despawn after damage stops occurring 2017-07-17 13:57:38 -04:00
AlexTheCoder
99c2522e92 Clean up the Clans blacklist GUI 2017-07-17 13:57:38 -04:00
AlexTheCoder
f00d9fbb54 Fix sales announcement remote updates being handled async 2017-07-17 13:57:38 -04:00
AlexTheCoder
7354c4dc1c Allow access to clans blacklisting from core, make GWEN issue 90-day clans blacklists for instabans and banwaves 2017-07-17 13:57:38 -04:00
AlexTheCoder
c2a46c14ed Allow weapon runes to be added to the Scythe of the Fallen Lord 2017-07-17 13:57:38 -04:00
AlexTheCoder
0b902e3f6f Fix the Scythe of the Fallen Lord healing the user when hitting allies and clan-mates 2017-07-17 13:57:38 -04:00
AlexTheCoder
5e540ea995 Increase legendary drop rate from raids and world bosses 2017-07-17 13:57:38 -04:00
AlexTheCoder
fdaa267f3e Remove the bow from clans custom item durabilities 2017-07-17 13:57:38 -04:00
AlexTheCoder
7054706b0f Begin work on clans capture point event 2017-07-17 13:57:38 -04:00
AlexTheCoder
82679aae8a Kill players who log out during raids and force respawn players who die in raids 2017-07-17 13:57:38 -04:00
AlexTheCoder
460cc29c04 Fix clan-mates and allies being able to force despawn mounts 2017-07-17 13:57:38 -04:00
AlexTheCoder
953ad66aca Update SalesAnnouncement system to allow clans-only announcements and make cross-server updating work properly 2017-07-17 13:57:38 -04:00
Sam
0fa8a80f2e Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-17 12:56:41 +01:00
cnr
f202085eeb Remove Heroes of GWEN from MPS 2017-07-15 13:21:29 -07:00
Sam
968bcc0223 Add MOBA to the game menu 2017-07-14 18:03:09 +01:00
Sam
4a5913bb3a Don't have the second towers be Elder Guardians 2017-07-14 17:40:22 +01:00
Sam
d9e1d211ac Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-14 13:33:06 +01:00
cnr
2fd3c9cc2f Send players into the training arena only if the game has started 2017-07-14 03:39:41 -07:00
cnr
6418a6006f Manually construct WatchableObjects for custom item frames 2017-07-14 03:00:59 -07:00
cnr
bdaea49d56 Fix Heroes of GWEN select menu 2017-07-13 23:47:56 -07:00
cnr
22676ab9e3 Add selection page for Heroes of GWEN training / normal game 2017-07-13 22:31:22 -07:00
cnr
1c75ec3f89 Merge branch 'feature/moba' into develop 2017-07-13 21:18:25 -07:00
cnr
690854d067 Add tps and ping to each GWEN metadata frame 2017-07-13 21:17:26 -07:00
cnr
7535200c35 Fix out of bounds exception in legendary particle 2017-07-13 18:17:30 -07:00
Sam
aa69b75be0 Final push 2017-07-14 02:04:29 +01:00
cnr
da08868206 Fix ClassCastException in HitQuestTracker 2017-07-13 18:02:39 -07:00
Sam
17ba7ffe8a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-07-13 15:50:05 +01:00
Sam
e777293866 Add achievements 2017-07-13 15:38:56 +01:00
Dan Mulloy
5cac083941 Add command to get versions, spawn wither skeletons with /mob 2017-07-12 22:54:38 -07:00
Sam
035c5e9011 Fix a typo 2017-07-12 22:50:17 -07:00
Sam
d15063a065 Fix "serverName" is restarting 2017-07-12 22:50:17 -07:00
Sam
8a18be0c5c Shorten and fix a typo in the senior moderator title 2017-07-12 22:50:17 -07:00
AlexTheCoder
c695bb570e Fix several thread-related issues in the leaderboard system 2017-07-12 22:49:44 -07:00
cnr
f77cc39f0c Merge branch 'feature/quests' into develop 2017-07-12 22:49:15 -07:00
Sam
59af31c6f8 Fix spectators being able to interact with hero selection 2017-07-13 00:18:45 +01:00
Sam
bfba119f3f Really hackily fix item maps 2017-07-13 00:16:50 +01:00
Sam
c4508b653a Remove rank requirement for HOG 2017-07-13 00:16:40 +01:00
Sam
25d3c09329 Complete implementation of game stats 2017-07-12 23:33:45 +01:00
Sam
c7c8a848b1 More fixes 2017-07-12 19:18:14 +01:00
Sam
0d7079eae7 Fix silver fish just not doing anything 2017-07-12 18:05:47 +01:00
Sam
f437ada4b9 Progress on game statistics 2017-07-12 16:49:50 +01:00
cnr
cecc3614b8 Set the correct key in QuitNPCRepository 2017-07-11 23:17:58 -07:00
Sam
06a8c191ac Complete the implementation for map boards 2017-07-12 00:38:54 +01:00
Sam
b7c629c4c8 Make item map billboards not really work 2017-07-11 02:10:43 +01:00
Sam
c18c6cfc6a More changes 2017-07-10 21:59:34 +01:00
cnr
c0cc3789b1 Fix server tps metadata key 2017-07-09 16:31:17 -07:00
Sam
7544ff98ae Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-09 00:22:30 +01:00
Sam
84752f0b17 Item maps 2017-07-08 01:34:19 +01:00
AlexTheCoder
dd12824402 Fix NPE in LootModule 2017-07-07 07:13:31 -04:00
AlexTheCoder
f73c78809a Whoops, forgot to change a line 2017-07-07 06:47:15 -04:00
AlexTheCoder
ce6ee670ed Use a try-with-resources for gem hunters redis calls 2017-07-07 06:44:19 -04:00
Sam
994517b3a4 Finish up training mode 2017-07-07 02:22:05 +01:00
Sarah
8e0bb18076 Fixes of current and new missions 2017-07-06 22:55:34 +02:00
Sam
590c3d804b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-07-06 17:15:51 +01:00
AlexTheCoder
b314744b6d Fix incorrect event argument in UpdateRank 2017-07-05 21:41:00 -07:00
AlexTheCoder
f92eae067f Add player ping and server tps to ban metadata 2017-07-05 21:41:00 -07:00
AlexTheCoder
a8c41f8904 Lowercase messages with >30 capital letters 2017-07-05 21:41:00 -07:00
md_5
4ccf9e39ad Remove pling sound from /msg for version compat 2017-07-05 21:39:39 -07:00
cnr
e1a5e1d111 Merge branch 'feature/staff-titles' into develop 2017-07-05 21:39:14 -07:00
AlexTheCoder
79644e706c Update CUST-1 menu for support staff request 2017-07-05 21:38:53 -07:00
AlexTheCoder
d61e067b86 Allow customer support to track freedom chests and improve error information to prevent forging/confusion 2017-07-05 21:38:53 -07:00
Sam
fd660f95a0 Fix players getting stuck in pregame lobbies 2017-07-05 21:38:53 -07:00
cnr
c341671ffc Move GH quit NPCs to redis; use region when saving GH data 2017-07-05 21:33:55 -07:00
Sam
ed3455db68 No need to update primary key 2017-07-06 00:59:43 +01:00
Sam
c5818b1bb5 Update time! 2017-07-06 00:35:05 +01:00
Sarah
1d046ff119 Add "all" to the GetMineplexMission Command, dont let specs get chest quest progress 2017-07-05 23:38:24 +02:00
Sam
dca43b6c57 Separate Gem Hunters inventories by region 2017-07-03 00:36:54 +01:00
Sam
85c90ff791 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/staff-titles 2017-07-03 00:17:16 +01:00
Sam
558eeb528f Kit progression complete 2017-07-03 00:17:09 +01:00
Sam
e2ff415e4d Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-01 15:36:10 +01:00
cnr
5a4fab5fc0 Separate out Haunted Chest purchase condition 2017-07-01 04:11:03 -07:00
cnr
cd110ddef9 Add purchase condition for freedom chests 2017-07-01 03:48:49 -07:00
cnr
832c766290 Merge branch 'update/july-cosmetics' into develop 2017-07-01 02:57:48 -07:00
Graphica
b36c5da721 Fix bug which stopped more than 1 use of ability 2017-07-01 05:56:53 -04:00
cnr
0ac3e227fd Merge branch 'feature/battle-royale' into develop 2017-06-30 22:15:53 -07:00
cnr
5ba1630fae Merge branch 'update/july-cosmetics' into develop 2017-06-30 22:15:31 -07:00
AlexTheCoder
43b1a118d3 Final tweaks and bugfixes for Sigils 2017-07-01 01:11:17 -04:00
Graphica
acaf3b2dd9 Change freedom treasure from 35k to 30k shards 2017-07-01 01:09:05 -04:00
Graphica
5957b96a4f Add freedom fighter morph 2017-07-01 01:07:32 -04:00
Graphica
5a86141e8f Fix costume count displaying incorrectly 2017-07-01 01:05:58 -04:00
Graphica
55a1afbb71 Expose banner data in CountryFlag 2017-07-01 01:05:44 -04:00
Graphica
b01cb0c2e9 Add Revolutionary SkinData 2017-07-01 01:05:05 -04:00
Sam
81ae3e0049 Give players rewards and remove debug messages 2017-06-30 19:32:08 +01:00
Sam
6dcdc57707 Adjust exp required 2017-06-30 15:13:21 +01:00
Sam
85342801a4 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-06-30 14:23:28 +01:00
Sam
29488a4ab8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-06-30 14:23:10 +01:00
Sam
041d0020bd Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/staff-titles 2017-06-30 14:22:52 +01:00
Sam
f719e0db8d Clean up player data 2017-06-30 14:22:43 +01:00
Sam
811463e586 Attempt to somewhat fix the lag whenever the game starts 2017-06-30 13:56:20 +01:00
Sam
67d792e9d7 More progress 2017-06-30 12:57:20 +01:00
Sam
a8e1799617 Fix Deathbomber achievement tracker 2017-06-30 00:27:12 +01:00
Sam
5a7c7b8fa3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/battle-royale 2017-06-29 11:27:45 +01:00
cnr
dfe2a61b8f Revert freedom chest cosmetics 2017-06-28 23:43:30 -07:00
cnr
ed67a44fef Merge branch 'feature/moba' into develop 2017-06-28 20:39:27 -07:00
Graphica
13f4211739 Stop outfits from taking off flags 2017-06-28 20:38:59 -07:00
Graphica
6639d6eaed Update disabled games for eternal taunt 2017-06-28 20:38:59 -07:00
Graphica
eeb8fabafe Change niceness aura to use red and white tulips 2017-06-28 20:38:59 -07:00
Graphica
c97506fe0e Align flowers correctly in spring leap 2017-06-28 20:38:59 -07:00
Graphica
732c996e94 Spawn trail particles behind player model 2017-06-28 20:38:59 -07:00
Graphica
c33c8998f8 Change Legend Aura to green 2017-06-28 20:38:59 -07:00
Graphica
2021a7e321 Correctly handle taunt cooldowns 2017-06-28 20:38:59 -07:00
Graphica
c2b025e883 Distribute heart particles using a gaussian curve 2017-06-28 20:38:59 -07:00
Graphica
a9311e7457 Reduce coal fume particles 2017-06-28 20:38:59 -07:00
Graphica
816f1467aa Remove green from candy cane cosmetics 2017-06-28 20:38:59 -07:00
Graphica
5a3e79a63f Add white to maple leaf death effect 2017-06-28 20:38:59 -07:00
Graphica
0495b2d1ec Add cosmetics unlock command for all players 2017-06-28 20:38:59 -07:00
Graphica
36ec3014bf Swap cosmetic menu positions of items 2017-06-28 20:38:58 -07:00
Graphica
1e289271c6 Clean up and add comments 2017-06-28 20:38:58 -07:00
Graphica
aba684ad95 Remove unnecessary packages 2017-06-28 20:38:58 -07:00
Graphica
7d17fa0f29 Update hubs with new CosmeticManager constructor 2017-06-28 20:38:58 -07:00
Graphica
f7ac799476 Overhaul legend particle 2017-06-28 20:38:58 -07:00
Graphica
ea8c7be5f0 Disallow eternal taunt disguising an already disguised player 2017-06-28 20:38:58 -07:00
Graphica
5387d3b580 Add cosmetics to chests 2017-06-28 20:38:58 -07:00
Graphica
4cc1068055 Allow Flags to interact with costumes and hats correctly 2017-06-28 20:38:58 -07:00
Graphica
e04d467830 Add new cosmetic items 2017-06-28 20:38:58 -07:00
Graphica
b214d43eec Update hat and flag type enums 2017-06-28 20:38:58 -07:00
Graphica
2eff6ae34b Reorganize packages 2017-06-28 20:38:58 -07:00
Graphica
4ef477159c Fix gadget pages 2017-06-28 20:38:58 -07:00
Graphica
53d29fc9c9 Reduce lag on Molten Snake 2017-06-28 20:38:58 -07:00
Graphica
c15e8f8f90 Allow UtilParticle to accept java awt colors 2017-06-28 20:38:58 -07:00
Graphica
39f11da634 Create flag gadget type 2017-06-28 20:38:58 -07:00
Graphica
93015151db Add Hat skin data 2017-06-28 20:38:58 -07:00
Graphica
7459a458cd Add gaussian methods to UtilMath 2017-06-28 20:38:58 -07:00
Sam
7bd5d65823 Reduce the amount of gems given for gold earned 2017-06-29 00:37:42 +01:00
Sam
b8bb25b04d Only reset player health upon actual respawn 2017-06-29 00:35:18 +01:00
Sam
67d8e0863d Fix overtime being at 1 minute 2017-06-29 00:13:06 +01:00
Graphica
f291d37896 Stop outfits from taking off flags 2017-06-28 18:40:24 -04:00
Sam
85007820d2 Add a go-back button to kit selection 2017-06-28 23:38:50 +01:00
Graphica
2ef463c859 Update disabled games for eternal taunt 2017-06-28 18:36:59 -04:00
Graphica
2e23aae024 Change niceness aura to use red and white tulips 2017-06-28 18:33:49 -04:00
Graphica
6abeadf0ea Align flowers correctly in spring leap 2017-06-28 18:33:28 -04:00
Graphica
61b8ed971d Spawn trail particles behind player model 2017-06-28 18:33:18 -04:00
Graphica
ca8041e5b7 Change Legend Aura to green 2017-06-28 18:33:00 -04:00
Graphica
cfc223f52a Correctly handle taunt cooldowns 2017-06-28 18:32:52 -04:00
Graphica
901d62c8e0 Distribute heart particles using a gaussian curve 2017-06-28 18:32:39 -04:00
Graphica
1899272a10 Reduce coal fume particles 2017-06-28 18:32:19 -04:00
Graphica
37996e6901 Remove green from candy cane cosmetics 2017-06-28 18:32:12 -04:00
Graphica
ea7475b950 Add white to maple leaf death effect 2017-06-28 18:32:00 -04:00
Graphica
7f729ca586 Add cosmetics unlock command for all players 2017-06-28 18:31:48 -04:00
Graphica
60f4511a79 Swap cosmetic menu positions of items 2017-06-28 18:31:39 -04:00
Sam
968fec5d77 Fix the cages not being removed correctly 2017-06-28 16:41:46 +01:00
Sam
82182c5d50 Balance changes 2017-06-28 15:34:56 +01:00
Graphica
c7e4f4bd4d Clean up and add comments 2017-06-28 02:02:57 -04:00
Graphica
fbd347ff41 Remove unnecessary packages 2017-06-28 01:40:46 -04:00
Graphica
9d1c3930b3 Update hubs with new CosmeticManager constructor 2017-06-28 01:37:33 -04:00
Graphica
082a197e8b Overhaul legend particle 2017-06-28 01:37:20 -04:00
Graphica
bfca6603c1 Disallow eternal taunt disguising an already disguised player 2017-06-28 01:37:06 -04:00
Graphica
3d4fc5fa9c Add cosmetics to chests 2017-06-28 01:36:49 -04:00
Graphica
e599f1653c Allow Flags to interact with costumes and hats correctly 2017-06-28 01:36:21 -04:00
Graphica
3d430dedf6 Add new cosmetic items 2017-06-28 01:35:57 -04:00
Graphica
3c929a4b00 Update hat and flag type enums 2017-06-28 01:35:22 -04:00
Graphica
19ddfb5c09 Reorganize packages 2017-06-28 01:34:51 -04:00
Graphica
1b39a54043 Fix gadget pages 2017-06-28 01:33:03 -04:00
Graphica
78445551a1 Reduce lag on Molten Snake 2017-06-28 01:31:54 -04:00
Graphica
c1765aaf20 Allow UtilParticle to accept java awt colors 2017-06-28 01:30:56 -04:00
Graphica
b7a094f472 Create flag gadget type 2017-06-28 01:30:29 -04:00
Graphica
845e96109b Add Hat skin data 2017-06-28 01:29:02 -04:00
Graphica
e9fea23382 Add gaussian methods to UtilMath 2017-06-28 01:28:39 -04:00
Sam
b9a72312a8 Add a go back button on kit selection 2017-06-28 00:21:47 +01:00
Sarah
333f1eda76 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-27 23:15:43 +02:00
Sarah
8541b984c6 Implement new Quests and fix older Quests 2017-06-27 23:15:25 +02:00
Sam
61dd8e088e More CS Progress 2017-06-27 17:52:20 +01:00
Sam
a79c79bc99 Add wither overtime 2017-06-27 12:38:43 +01:00
cnr
ed541b7a4f Disable automatic timings reports 2017-06-26 20:17:50 -07:00
Sam
9cdc698999 Make it compile 2017-06-26 22:17:36 +01:00
Sam
76e13df32b More castle siege 2017-06-26 20:42:10 +01:00
Sam
9f182d123f Castle Siege partial re-code 2017-06-25 18:29:34 +01:00
Sam
31533f29b7 Add Guns into Battle Royale 2017-06-24 18:19:56 +01:00
Sam
3c031c70a1 Fix training lobby bugs 2017-06-24 10:09:52 +01:00
Sam
c6a3001bae Basic battle royale game 2017-06-23 22:31:08 +01:00
Sam
4c6dfe6657 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-23 14:16:32 +01:00
Sam
98f9a58849 Fix light arrows being able to damage yourself 2017-06-23 14:12:36 +01:00
cnr
dddeb69391 Change beta requirement to ULTRA 2017-06-22 23:35:10 -05:00
cnr
b43203f831 Revert "Disable beta whitelist for MOBA"
This reverts commit 0374506879.
2017-06-22 23:32:55 -05:00
md_5
a6493ed18a Update MapParser to 1.12, refactor out some common base utilities. 2017-06-22 23:25:20 -05:00
cnr
0374506879 Disable beta whitelist for MOBA 2017-06-22 23:20:07 -05:00
cnr
6b24c55fef Merge branch 'feature/moba' into develop 2017-06-22 23:15:16 -05:00
Sam
b1c3b2c937 Balance changes and QOL changes 2017-06-23 02:11:17 +01:00
Sam
2912968295 Fix movable NPCs 2017-06-23 01:51:16 +01:00
Sam
21c7b082b0 Add a method to clear purchases 2017-06-23 01:43:38 +01:00
Sam
65ebf41d4f Finish the training game for now 2017-06-23 01:43:11 +01:00
Sam
8fb2c81c7f Shorten SR.MOD title 2017-06-22 21:45:09 +01:00
Sam
b064542c4e Staff and Clans Title 2017-06-22 21:39:37 +01:00
Sam
f22a091fa0 More training game stuff 2017-06-22 20:21:19 +01:00
Sam
e99be53bb5 Add a middle class to deal with multiple modes 2017-06-22 12:07:11 +01:00
Sam
0fe2c52500 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-21 13:57:12 +01:00
AlexTheCoder
61c57deaaa Disable these damn guardians lagging my clans servers 2017-06-19 19:01:09 -05:00
cnr
31605b02b0 Use polygon geometry for MOBA Boss AI boundaries 2017-06-19 18:38:31 -05:00
AlexTheCoder
7868287ace Temporarily disable clans maps 2017-06-19 18:32:57 -05:00
Sam
db98aa01c8 Training game base 2017-06-19 17:10:06 +01:00
cnr
185ac9fc05 Allow youtubers into full clans servers 2017-06-18 11:23:16 -05:00
Sam
17bfe9ee0a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-18 10:55:46 +01:00
cnr
afdf1a1ad6 Fix missed string -> ClaimLocation migration 2017-06-17 15:45:39 -05:00
cnr
739cb83deb Revert "Re-implement the main clans tutorial"
This reverts commit 1574d93d1b.
2017-06-17 14:50:58 -05:00
cnr
1658afefca Don't key Maps by strings; use simple data type instead 2017-06-17 14:36:38 -05:00
Sam
51460475de Change the Shop Item description 2017-06-17 12:47:28 +01:00
Sam
dda27cb7fe Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-17 12:45:16 +01:00
Sam
9c5565ac3b Remove recalling as it is unused 2017-06-17 12:45:15 +01:00
Sam
04fafea3ed Fixed a number of error causes 2017-06-17 12:40:08 +01:00
cnr
599f391001 Fix build (typo) 2017-06-16 22:36:33 -05:00
Sam
b8d160388f Removed dropped exp from entity kills and fishing 2017-06-16 22:27:11 -05:00
cnr
c4d5ed4cbd Merge branch 'feature/clans-season-3' into develop 2017-06-16 22:26:36 -05:00
cnr
04d9e7326d Fix NPE in OP Skywars startup 2017-06-16 19:22:53 -05:00
Alexander Meech
10df654e42 Track enjin/support-given clans boxes in CUST-1 2017-06-16 18:36:38 -04:00
Alexander Meech
4e8838d99e Add Clans Dye Box and Clans Builder Box to CUST-1 2017-06-16 18:23:11 -04:00
Alexander Meech
93a316e5e3 Add clans box sales package 2017-06-16 18:20:21 -04:00
Alexander Meech
7a2864a701 Merge branch 'develop' into feature/clans-season-3 2017-06-16 16:25:57 -04:00
AlexTheCoder
d8bdda2c52 Update clans world border size for new map 2017-06-16 16:21:21 -04:00
Sam
b758254f4c Don't reset the player when an item is purchased 2017-06-16 18:54:23 +01:00
AlexTheCoder
2b4aecd882 Fix bosses 2017-06-16 00:01:43 -04:00
AlexTheCoder
f6c7eaf28b Formatting fix 2017-06-15 23:47:12 -04:00
AlexTheCoder
fcce06fea9 Update item system for new legendary 2017-06-15 23:11:07 -04:00
AlexTheCoder
c64c0866fb Update Spawn locations for new map 2017-06-15 23:10:55 -04:00
AlexTheCoder
add639070a Fix cannons not firing 2017-06-15 23:10:28 -04:00
AlexTheCoder
1cdf9d2bba Final season 3 world event tweaks (adds skeleton king) 2017-06-15 23:10:16 -04:00
cnr
87e1ebb2af Merge branch 'feature/moba' into develop 2017-06-15 22:10:15 -05:00
AlexTheCoder
5829b720a8 Update spawn and shop locations for new map 2017-06-15 23:09:34 -04:00
AlexTheCoder
21d05b383b Fix skull and string place exploits 2017-06-15 23:09:16 -04:00
AlexTheCoder
394ebf9ad0 Tweak nether minibosses 2017-06-15 23:09:01 -04:00
AlexTheCoder
f4397d0b0b Tweak boss nether portals 2017-06-15 23:08:50 -04:00
AlexTheCoder
70212f9596 Tweak jump star values to final levels 2017-06-15 23:08:15 -04:00
AlexTheCoder
4485b4bc67 Add mount tokens to the rare loot pool 2017-06-15 23:07:53 -04:00
AlexTheCoder
01df9b7e44 Prevent claiming via gui in nether or raid worlds 2017-06-15 23:07:21 -04:00
AlexTheCoder
802cde9280 Update clans gui icons to reflect resource pack changes 2017-06-15 23:07:03 -04:00
AlexTheCoder
1ea0b4d33a Final polish on builder box 2017-06-15 23:06:38 -04:00
AlexTheCoder
e8a4e23f05 Fix mute bypasses via clans chat commands 2017-06-15 23:05:41 -04:00
AlexTheCoder
fc3a4bdbfe Fix purchase item goal in tutorial 2017-06-15 23:05:16 -04:00
AlexTheCoder
724604c76a Fix bug preventing TNT generators from working if purchaser leaves the clan 2017-06-15 23:03:30 -04:00
cnr
336777f89a Add builders to the beta whitelist 2017-06-15 18:15:04 -05:00
Sam
5b985c33ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-15 23:26:57 +01:00
Sam
07779cdf55 Reduce the damage from TNT Infusion 2017-06-15 23:26:56 +01:00
Sam
a12564c8a9 Fix consumables 2017-06-15 23:26:29 +01:00
cnr
d2c9173943 Add missing instanceof check 2017-06-15 17:19:19 -05:00
Sam
fe17a42724 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-15 21:22:39 +01:00
Sam
c2cbcfc62f Fix spamming bombardment 2017-06-15 21:22:26 +01:00
Alexander Meech
d4f27ef768 Update xenforo forum id for mapper rank 2017-06-14 22:28:28 -05:00
cnr
ba506f9c7b Fix beta whitelist duplicate-enable 2017-06-14 22:26:29 -05:00
cnr
27f5da06f4 Merge branch 'feature/moba' into develop 2017-06-14 20:02:25 -05:00
Sam
a5fd9bef79 Turns out Achievements are case sensitive 2017-06-15 02:01:26 +01:00
Sam
cfe8840d7a Fix some really silly things 2017-06-15 01:59:00 +01:00
cnr
8e9c5c43e4 Remove unused agentCacheMap in CUST 2017-06-14 19:57:58 -05:00
cnr
05eabdbfd8 Merge branch 'feature/moba' into develop 2017-06-14 19:55:53 -05:00
cnr
2a0796472b Add beta whitelist to MOBA 2017-06-14 19:54:23 -05:00
Sam
29d5a80a67 Final changes 2017-06-15 01:33:20 +01:00
cnr
6c093cc458 Reduce beta participation rank constraint to TITAN 2017-06-14 17:23:20 -05:00
cnr
8d1aa176d3 Remove unused agentCacheMap in CUST 2017-06-13 23:49:14 -05:00
cnr
c533b170fe Add /checkppc to CUST for detailed subscription data 2017-06-13 23:47:30 -05:00
AlexTheCoder
bc61bdff5e Update territory display to show raid world and prevent autoclaiming in nether or raid worlds 2017-06-13 23:17:28 -04:00
AlexTheCoder
6ef6abcd72 Initial implementation of raid legendary 2017-06-13 23:16:51 -04:00
AlexTheCoder
3b4bad7bba Further change builder box UI 2017-06-13 23:16:24 -04:00
AlexTheCoder
64c084ecb3 Handle Hardcore and Casual modes in clans mechanics 2017-06-13 23:16:00 -04:00
AlexTheCoder
d168e03f80 Check for Hardcore mode in Clans Server Selector 2017-06-13 23:13:18 -04:00
Sam
4978f924a7 Lots of bug fixes 2017-06-13 21:49:34 +01:00
Sam
3efeb38a01 Working through JIRA 2017-06-13 00:29:05 +01:00
Sam
6df8330b3f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-12 23:03:20 +01:00
cnr
3d8998ee13 Change missed BETA_HUB -> HUB in GH server-sending 2017-06-12 15:43:29 -05:00
AlexTheCoder
9da5b367fd Further improve raids 2017-06-12 01:06:33 -04:00
AlexTheCoder
97efeca225 Increase outpost costs and add mounts to pvp shop 2017-06-12 01:05:02 -04:00
AlexTheCoder
97c8dc7cf4 Make safelog holograms follow their loggers 2017-06-12 01:04:26 -04:00
AlexTheCoder
a952ee31cd Remove Repair functionality from Gameplay class 2017-06-12 01:04:05 -04:00
AlexTheCoder
5045bad684 Unify item durabilities in clans 2017-06-12 01:03:39 -04:00
AlexTheCoder
d2d3b88651 Improve siege weapons 2017-06-12 01:03:15 -04:00
AlexTheCoder
3d88c2c9a5 Block territory claiming and setting clan homes in the nether 2017-06-12 01:02:38 -04:00
AlexTheCoder
c265b235be Tidy up ClansAdmin Commands 2017-06-12 01:02:04 -04:00
AlexTheCoder
f1b9a99576 Make mounts disable when server does 2017-06-12 01:01:48 -04:00
AlexTheCoder
ece1461384 Tidy up mounts and implement the mount skins 2017-06-12 01:01:24 -04:00
AlexTheCoder
8ee5faf4d9 Change boxes more 2017-06-12 01:00:09 -04:00
AlexTheCoder
a268b0dfff Fix freeze broadcasting to entire server unintentionally 2017-06-12 00:59:31 -04:00
Sam
c8340730ad Improve Bardolfs wolves 2017-06-11 00:00:28 +01:00
Sam
b6c5052db8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-09 13:10:14 +01:00
Sam
ac52903b7d QOL changes 2017-06-09 13:10:11 +01:00
cnr
68084c5cf0 Insert linebreaks in mapper + mapdev descriptions 2017-06-09 02:43:34 -05:00
cnr
d226a4e710 Remove Gem Fountain and open brawl on weekends 2017-06-09 00:14:49 -05:00
AlexTheCoder
87966ddedd Season 3 2017-06-08 20:20:10 -04:00
AlexTheCoder
e7174a0e4e Add an item unbreakable checker to UtilItem 2017-06-08 20:19:12 -04:00
AlexTheCoder
986d4f3dcc Properly restrict moderation staff testrank access 2017-06-08 20:15:41 -04:00
AlexTheCoder
ecd9812f0c Properly return empty value in ItemStackFactory 2017-06-08 20:12:44 -04:00
cnr
3c3cffb001 Add MAPPER rank and modify BUILDER description 2017-06-08 18:53:37 -05:00
Sam
79b983536d While Withered, prevent regeneration 2017-06-08 22:55:17 +01:00
Sam
e94ab9598a New Heroes 2017-06-08 22:43:50 +01:00
Sam
4fb4c2c865 Fix merge imports 2017-06-08 16:11:25 +01:00
Sam
206dd56d14 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 16:10:49 +01:00
Sam
9844ca338a Complete Biff 2017-06-08 16:09:32 +01:00
Sam
a767135ce0 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 13:08:54 +01:00
Graphica
8138b5d241 Fix Bob Ross morph carpets not disappearing 2017-06-08 00:49:40 -05:00
Graphica
4628af6e81 Call treasure start event after teleporting the player 2017-06-08 00:49:33 -05:00
Sam
1d64bb63c4 Add a check to prevent a possible duplication bug 2017-06-08 02:18:57 +01:00
Sam
b59e57dfb6 Fixed Players not being given their Gem Hunters rewards for the final time! 2017-06-08 02:10:24 +01:00
Sam
8c821af9de Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-08 02:09:24 +01:00
Sam
044927252c More changes! 2017-06-08 01:55:07 +01:00
cnr
7cc7769378 Send gem hunters players to normal hub upon cashout 2017-06-07 18:26:56 -05:00
Kenny Goodin
83f6b4fa1d Fill in actual quest rarity weights 2017-06-07 02:18:37 -05:00
Sam
697d4a11ed Fix the Quest achievement looking for the wrong stat 2017-06-06 23:00:17 +01:00
Sam
a800fee08c Testing session changes 2017-06-06 22:59:40 +01:00
Sam
16f9364772 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-06 19:31:20 +01:00
Sam
8f87578a57 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-06 19:28:54 +01:00
Sam
a63399943d Leaderboards and UFO world event 2017-06-06 19:28:41 +01:00
Sam
4a91d2821b Achievements 2017-06-05 20:57:30 +01:00
cnr
629ced569c Fix treasure location comparison between worlds 2017-06-05 11:52:44 -05:00
Sam
a3fd81f763 Fix Biff's skills not cleaning up 2017-06-04 10:52:43 +01:00
cnr
347cddccc0 Use UUID in enjin commands instead of name 2017-06-03 14:22:04 -05:00
Sam
e094446be4 Add biff to the hero list 2017-06-03 15:33:26 +01:00
Sam
dbde734e76 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-03 14:54:43 +01:00
Sam
c3f3d71610 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-03 14:53:34 +01:00
Sam
674253c89a Gen Hunters Title 2017-06-03 14:53:33 +01:00
Sam
092c5db6b2 Merge remote-tracking branch 'refs/remotes/origin/update/gem-hunters-11-5' into update/gem-hunters 2017-06-02 20:10:51 +01:00
Sam
7e05cbfa87 Biff 2017-06-02 18:43:07 +01:00
Sarah
844052c0c6 Async db calls... 2017-06-02 07:05:23 -05:00
Sarah
84cb803c66 Async db calls... 2017-06-02 13:22:12 +02:00
Alexander Meech
62d15eeee1 Make podium generation setting based on map rather than hardcoded server group 2017-06-02 02:42:21 -05:00
Dan Mulloy
abaaaebd43 Use "Coming soon!" instead of empty string 2017-06-02 00:04:47 -05:00
Dan Mulloy
414573c18d Make Carl more robust, print better warnings when he breaks 2017-06-02 00:02:00 -05:00
cnr
2701476ea8 Merge branch 'feature/quests' into develop 2017-06-01 21:47:38 -05:00
Sarah
73897e407b Add fix for new game lobbies 2017-06-02 03:41:06 +02:00
Sarah
4b54232514 make slime not go small 2017-06-02 02:21:13 +02:00
Sarah
0c6fcba21f Improve NPC visuals 2017-06-02 02:00:20 +02:00
cnr
b6a1a3a054 Only request quests once on startup 2017-06-01 17:29:42 -05:00
Kenny Goodin
cea9b00b68 Subscribe to quest request channel before requesting from daemon 2017-06-01 18:27:02 -04:00
cnr
60a696a82e Subscribe to response channel before requesting quests 2017-06-01 17:25:30 -05:00
Sarah
b823fc62c9 Fix quests not disappearing after completing 2017-06-02 00:03:34 +02:00
Sarah
aaf4be1dc2 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 20:59:53 +02:00
Sarah
9b64f5da66 change quest name to "Mineplex Mission" 2017-06-01 20:59:35 +02:00
Kenny Goodin
2f1f7a1e7d Debug quest supplier 2017-06-01 14:59:22 -04:00
Sarah
9bfa586f61 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 20:16:08 +02:00
Sarah
3c5f8bf72d add names to quests in the stats gui, add different reward colors, properly remove "next Page" and "Previous Page" buttons from stats page 2017-06-01 20:15:39 +02:00
Sam
66b89d6e64 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-01 13:01:48 +01:00
AlexTheCoder
e94201409b Finalize raid system and implement Charles Witherton Raid 2017-06-01 02:16:12 -04:00
AlexTheCoder
fdd48b51d4 Start work on raids 2017-06-01 02:16:12 -04:00
AlexTheCoder
9fcf718e65 Tweak dye boxes 2017-06-01 02:16:12 -04:00
AlexTheCoder
b1b12babf0 Slight fixes to boxes 2017-06-01 02:16:12 -04:00
AlexTheCoder
21759c35c9 Added boxes to clans and used lambda for mount gui 2017-06-01 02:16:12 -04:00
AlexTheCoder
03149fc49b Implement the iron wizard boss with tidied up code and the new world event api 2017-06-01 02:16:12 -04:00
AlexTheCoder
4e58fa1e6c Implement an arena manager for the specific bosses on the map 2017-06-01 02:16:12 -04:00
AlexTheCoder
77f13f9b4c Slightly improve boss worldevent api 2017-06-01 02:16:12 -04:00
AlexTheCoder
a17b0c95bf Update existing command and api classes to support new worldevent changes 2017-06-01 02:16:12 -04:00
AlexTheCoder
b0297e404c Deactivate events lacking implementation 2017-06-01 02:16:12 -04:00
AlexTheCoder
3ea378110c Convert nether listener to spawn boss portals with the new boss event system 2017-06-01 02:16:12 -04:00
AlexTheCoder
150f1d1de9 Add implementation for managing world events 2017-06-01 02:16:12 -04:00
AlexTheCoder
cff2ca5414 Implement a new worldevent api to better handle events in clans, and begin implementing the api in place of the old 2017-06-01 02:16:12 -04:00
AlexTheCoder
b14ecdbe4f Fix outposts to not break if the clan has blank banner pattern layers 2017-06-01 02:16:12 -04:00
AlexTheCoder
8ea90eb914 Prevent breaking banners in zones the player does not have build access in 2017-06-01 02:16:12 -04:00
AlexTheCoder
9829527688 Remove armor stands causing memory leaks 2017-06-01 02:16:12 -04:00
AlexTheCoder
c78ee51307 Add method for testing 2d squared distance 2017-06-01 02:16:12 -04:00
AlexTheCoder
2f0acc4a00 Block outposts being spawned in water causing them to break 2017-06-01 02:16:12 -04:00
AlexTheCoder
8c911426fd Slight UI improvements and made fall damage no longer count towards mount despawn hits 2017-06-01 02:16:12 -04:00
AlexTheCoder
3c4eee910f Finish implementation of Mounts, tidy up mount saving, implement mount GUIs 2017-06-01 02:16:12 -04:00
AlexTheCoder
264b7f86cf Implement mounts and remove legacy horse dismount code 2017-06-01 02:16:12 -04:00
AlexTheCoder
8c27c4349d Allow horses to be forcibly spawned but prevent them from naturally occurring 2017-06-01 02:16:12 -04:00
AlexTheCoder
c6bd00a811 Make UtilEnt#GetMetadata actually return the field assigned to that metadata key and add a method to remove metadata from an entity 2017-06-01 02:16:12 -04:00
AlexTheCoder
76d5d3e896 More appropriately name fields in the CustomDamageEvent getDamagerPlayer method in order to be more understandable 2017-06-01 02:16:12 -04:00
AlexTheCoder
570355e41b Fix error runnables not being passed through even when intended to 2017-06-01 02:16:12 -04:00
AlexTheCoder
6d67a4f9f8 Fix null pointer causing console spam (SENTRY ISSUE 223503319) 2017-06-01 02:16:12 -04:00
AlexTheCoder
03d9032f82 Add backend system for saving/loading clans mounts with varied stats and skins 2017-06-01 02:16:12 -04:00
AlexTheCoder
b7a566744c Formatting fix 2017-06-01 02:16:12 -04:00
AlexTheCoder
cc1bb3cfe9 Make outposts utilize the Clan Banner of their owner 2017-06-01 02:16:12 -04:00
AlexTheCoder
2e04490001 Change nether miniboss rewards to drop crafting materials beyond diamonds and add the ability to drop set pieces 2017-06-01 02:16:12 -04:00
AlexTheCoder
48967b4a74 Block exploit allowing clans to make a lot of allies and then add members to disrupt the equation. Additionally, lower the maximum amount of allies per member 2017-06-01 02:16:12 -04:00
AlexTheCoder
35f2d42d08 Remove height limitations on planting crops 2017-06-01 02:16:12 -04:00
AlexTheCoder
1574d93d1b Re-implement the main clans tutorial 2017-06-01 02:16:12 -04:00
AlexTheCoder
08b89fbb4b Change farming shop prices 2017-06-01 02:16:12 -04:00
Alexander Meech
01e7dc85dd Merge branch 'develop' into feature/quests 2017-05-31 22:21:24 -04:00
cnr
921aaea5bd Disable Toggle check from the plugin side until tomorrow 2017-05-31 21:16:58 -05:00
Sam
c34bf77dc9 More testing feedback 2017-06-01 00:55:33 +01:00
Sarah
738090bb30 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 00:34:38 +02:00
Sarah
d7731d330c Do some visual adjustments, add back button to quest stats menu, remove quest from buy bar after completion 2017-06-01 00:34:21 +02:00
Kenny Goodin
1cf04592da Whoops, actually add the 'fail-safe' 2017-05-31 16:00:00 -04:00
Kenny Goodin
13ad590487 Reduce QuestDaemon log spam, add failsafe for when no active quests are loaded 2017-05-31 15:58:28 -04:00
Sarah
c355015041 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-31 21:51:25 +02:00
Sarah
5c8e6d84b0 Add increment command, Questtrackers, change some visuals, allow Quests to have multiple required items 2017-05-31 21:51:04 +02:00
Sam
8a9e113389 Improvements to the targetting system 2017-05-31 17:09:08 +01:00
Sam
70eec9e38c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:17:41 +01:00
Sam
edfadde239 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:05:13 +01:00
Sam
0edd2c8947 Feedback from testing 2017-05-31 13:05:06 +01:00
Kenny Goodin
ff12121926 Fix QuestDaemon command that didn't actually do anything 2017-05-31 02:35:16 -04:00
Kenny Goodin
028a4ecce3 Remove author tag 2017-05-31 02:15:23 -04:00
Kenny Goodin
ffdd82c34e Ignore quests in QuestDaemon process that have a cost of -1 2017-05-31 02:02:30 -04:00
cnr
6e2d39035d Add Bob Ross morph to PPC for June 2017-05-30 22:50:41 -05:00
Graphica
a87685eae0 Change color selector and put colors in order 2017-05-30 22:49:30 -05:00
Graphica
cf8109b3bd Add method for detecting bottom slabs to UtilBlock 2017-05-30 22:49:30 -05:00
Graphica
9c48919e42 Reduce paint time down to 30 seconds 2017-05-30 22:49:30 -05:00
Graphica
6b2a99a881 Make quotes be activated with a shift click 2017-05-30 22:49:30 -05:00
Graphica
a61c4cd816 Fix holograms not following players in 1.9+ 2017-05-30 22:49:30 -05:00
Graphica
98929f043f Make brush types varied and colored in player hotbars 2017-05-30 22:49:30 -05:00
Graphica
7baf3bad30 Clean up Hologram class code 2017-05-30 22:49:30 -05:00
Graphica
2c6112347a Add Bob Ross Morph 2017-05-30 22:49:30 -05:00
Kenny Goodin
b139d0550b Periodically purge expired elements from recently seelected quests repo 2017-05-30 20:36:39 -04:00
AlexTheCoder
2fc423306b Add appropriate starter level for multi-tiered achievements with level names to fix incorrect array length 2017-05-29 22:49:23 -05:00
cnr
b9af3a8dfb Sort CMA in the tab list next to Mod 2017-05-29 22:49:01 -05:00
Alexander Meech
e501982712 Update cma scoreboard id 2017-05-29 22:48:25 -05:00
Alexander Meech
f793539cc4 Allow cma to see freeze/unfreeze information 2017-05-29 22:48:25 -05:00
Alexander Meech
57f2f7b686 Give cma access to clans punishments 2017-05-29 22:48:25 -05:00
Alexander Meech
1adb4b8239 Give cma access to freeze 2017-05-29 22:48:25 -05:00
Alexander Meech
cd8e805435 Give CMA access to unfreeze 2017-05-29 22:48:25 -05:00
Alexander Meech
2895397aec Implement CMA rank 2017-05-29 22:48:25 -05:00
cnr
1a59c050d3 Disable Alien Invasion event 2017-05-29 22:45:54 -05:00
cnr
f1bad41e89 Revert "Enable double XP + gems + shards for the weekend"
This reverts commit aa271a1bd3.
2017-05-29 22:44:54 -05:00
Sam
c3a80ed0cb Fix pumpkin king's death not being logged properly 2017-05-29 12:40:18 +01:00
Sam
72ba5e0686 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-05-28 16:27:59 +01:00
Sam
9e9bfe79de Pumpkin king boss 2017-05-28 16:27:54 +01:00
Sam
911fd030f3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-28 13:20:24 +01:00
Sam
efdffa6272 Level reward system 2017-05-28 12:57:44 +01:00
cnr
e51818c15d Reduce alien shard reward to 5 per hit and make lobbies nighttime 2017-05-28 02:08:17 -05:00
Sam
18197de7be Correct operator... 2017-05-27 18:24:51 +01:00
Sam
5bdcd3474f Only give the chest once 2017-05-27 18:23:53 +01:00
Sam
b9ad85dd1e Pumpkin King boss 2017-05-27 18:19:14 +01:00
Sam
ffa2a736ec Give players an omega chest for completing the event 2017-05-27 17:03:52 +01:00
Sam
8f2c84b842 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 16:46:20 +01:00
Sam
8e87b1d3e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 13:55:36 +01:00
Sam
7705bd34a3 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/aliens 2017-05-27 01:05:04 +01:00
Sam
27d9233566 While we're at it, change the easter egg achievement requirement 2017-05-27 01:05:02 +01:00
Sam
4d4988577e Use a more sensible method of awarding shards 2017-05-27 01:01:16 +01:00
Sam
e3f678d71d Bugs 2017-05-27 00:56:38 +01:00
cnr
aa271a1bd3 Enable double XP + gems + shards for the weekend 2017-05-26 18:20:27 -05:00
cnr
4a7ca75b24 Open UFO event for the weekend 2017-05-26 18:08:24 -05:00
Sam
36733e9918 Fix gametype imports 2017-05-26 18:37:35 +01:00
Sam
d70cd38049 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-26 18:34:23 +01:00
Sam
5c8a36b024 Sigils bug fixes 2017-05-26 18:33:06 +01:00
cnr
b46464babe Reduce UFO beam radius from 5 -> 3 blocks 2017-05-25 22:42:14 -05:00
cnr
fbd39092f8 Add delay for should-start-invasion check 2017-05-25 04:47:35 -05:00
Sam
5ae32de83c Reduce the cooldown from 6 to 3 seconds 2017-05-24 21:05:58 -05:00
cnr
fd1cd148cb Implement Alien Event service calls on Hub/Arcade 2017-05-24 20:52:24 -05:00
Sarah
b7ba532568 Add quest stats page, make rewards be able to be items as well, fix some quest trackers, fix spelling mistakes 2017-05-25 00:40:41 +02:00
Sam
a134c1da5c Sign off changes 2017-05-24 19:19:52 +01:00
Sam
94e97daede Add a nice message to the alien speak 2017-05-24 18:39:16 +01:00
Sam
3701d2d950 Remove pointless messages 2017-05-24 18:30:41 +01:00
Sam
a6c1e6c892 Make minions target each other 2017-05-24 18:27:10 +01:00
Sam
6f48d0ee43 Improve the path finding ai 2017-05-23 22:57:13 +01:00
Sam
78b10e3cb8 Fix the majority of bugs for the 1 lane game 2017-05-23 20:37:31 +01:00
Sam
40543a5034 Fix gametype import 2017-05-22 23:00:22 +01:00
Sam
9df9fb80da Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-22 22:59:46 +01:00
Sam
4ed3135cdf Implement improved targetting system 2017-05-22 20:53:22 +01:00
Sam
49045e3f68 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-22 20:53:05 +01:00
Sam
176253faec Remove minion command 2017-05-21 17:33:33 +01:00
Sam
cbb63ba943 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/gem-hunters-dupe 2017-05-20 17:46:07 +01:00
Sam
92604bf6ad Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:36 +01:00
Sam
1db7454e81 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:19 +01:00
Sam
670e9db9d2 Add Region to the slack logging 2017-05-20 17:33:00 +01:00
Sam
474c2e78f2 Check to make user the player has the itemstack when cashing out 2017-05-20 17:32:44 +01:00