Commit Graph

12453 Commits

Author SHA1 Message Date
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
Sam
378fddf0c5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-16 18:44:50 +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