Commit Graph

9484 Commits

Author SHA1 Message Date
samczsun
1e5d91e392
Make porting from old legendaries work, fix null commandcenter 2016-06-15 21:52:25 -04:00
samczsun
d49ce27a1b
Make GearShop work again 2016-06-15 21:52:25 -04:00
samczsun
808e506911
Revert "Revert "Clans optimizations""
This reverts commit 25a315ac05.
2016-06-15 21:52:25 -04:00
samczsun
45e6cb902f
Save changes 2016-06-15 21:52:25 -04:00
samczsun
a753a3ab07
Clean up legendary code 2016-06-15 21:52:25 -04:00
Shaun Bennett
2f1954e41c Rename to booster group 2016-06-15 18:18:09 -05:00
Shaun Bennett
cbfbd6fe1c Booster GUI update 2016-06-15 17:40:20 -05:00
TadahTech
27afd3d96c Kit progression update 2016-06-15 15:54:53 -05:00
LCastr0
0160efb5ab Merge pull request #95 from Mineplex-LLC/develop
Merge develop into project-cosmetics
2016-06-15 11:22:03 -03:00
Thanos Paravantis
e5cec9c976 Change min players on Treasure Digger back to 4 2016-06-14 14:44:43 +03:00
Thanos Paravantis
47a4e5d9a9 Make chickens attack with more accuracy 2016-06-14 14:41:56 +03:00
Shaun Bennett
aa785ed3d5 Code clean-up and documentation 2016-06-12 21:18:11 -05:00
TadahTech
22e22ff508 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-12 00:42:22 -05:00
xXVevzZXx
bf4de4471a fix permanent item removal and battle items in inventory 2016-06-11 17:33:12 +02:00
xXVevzZXx
bc77605dcd make crafted weapons in SG unbreakable 2016-06-11 16:43:56 +02:00
xXVevzZXx
a461e9cf1c fix inventory being editable while voting phase 2016-06-11 16:27:31 +02:00
xXVevzZXx
75e36d0e08 fix pickup of dropped tnt 2016-06-11 16:13:07 +02:00
xXVevzZXx
5e551a2ba6 fix waller only being able to make two walls 2016-06-11 15:49:31 +02:00
Keir Nellyer
6bc8039dbd Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-11 14:04:43 +01:00
Keir Nellyer
ed50e09a6e Fix issue an old un-closed but expired report may be re-opened and cause issues 2016-06-11 13:59:53 +01:00
Keir Nellyer
197acee4ae Implement server weighting 2016-06-11 13:47:45 +01:00
Shaun Bennett
cf87469400 Fix a possible NPE, use proper IP and port for api 2016-06-10 20:24:22 -05:00
Shaun Bennett
2421fd1cfe Update booster page, proper booster rewards 2016-06-10 19:40:27 -05:00
Shaun Bennett
42c35063b3 Display all the boosters you have activated 2016-06-10 17:40:59 -05:00
xXVevzZXx
73d8aec494 fix breakable Armor in Wizards 2016-06-11 00:21:04 +02:00
xXVevzZXx
b13b354ce7 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
2016-06-11 00:20:38 +02:00
Shaun Bennett
6964b1f266 Booster gui command 2016-06-10 17:20:23 -05:00
Shaun Bennett
e6920b4549 Work on booster gui, display wait time 2016-06-10 17:17:43 -05:00
Shaun Bennett
ceb4de8b35 Load booster groups for arcade 2016-06-10 16:33:53 -05:00
Thanos Paravantis
6d380c6c6f Rename building champion to Speedy Builders 2016-06-10 22:44:13 +03:00
cnr
06cee364fc Merge branch 'mopple' into develop 2016-06-10 14:12:07 -05:00
Shaun Bennett
0a204a3b90 Use redis pub/sub to send booster updates 2016-06-10 12:44:27 -05:00
LCastr0
f8def923bb Merge pull request #91 from Mineplex-LLC/develop
Merge develop into project-cosmetics
2016-06-10 13:52:59 -03:00
Sam
739fcdc649 Fixes the problem where players could not fire a bow in OITQ
Users with high latency were not able to fire bows.
2016-06-10 16:29:27 +01:00
Keir Nellyer
a73e1c24b5 Properly calculate user reputation 2016-06-10 15:47:59 +01:00
Thanos Paravantis
f47d2abd87 Hide map quicker from players 2016-06-10 16:44:51 +03:00
Thanos Paravantis
f277e5ca9a Fix diamond hunt map creation 2016-06-10 16:44:11 +03:00
Thanos Paravantis
1ed27e72a6 Use resetBlock method to set air blocks 2016-06-10 16:08:06 +03:00
Thanos Paravantis
5b021d3ecc Update all challenges to use new set block method 2016-06-10 16:03:33 +03:00
Thanos Paravantis
00f14131df Update treasure digger to use new set block method and apply minor improvements on chicken attack 2016-06-10 15:11:48 +03:00
Keir Nellyer
380139477c Reduce expiry time for reports 2016-06-10 12:59:50 +01:00
Keir Nellyer
36f47b7067 Clear report cache when report is closed 2016-06-10 12:41:02 +01:00
Keir Nellyer
09009c352b Remove new-line in query 2016-06-10 12:34:23 +01:00
Keir Nellyer
2cacdbae34 Use more robust Guava Cache class for caching 2016-06-10 12:33:46 +01:00
Thanos Paravantis
47c4e57ce4 Fix unexpected challenge end 2016-06-10 13:33:20 +03:00
Thanos Paravantis
52ce640391 Merge branch 'develop' into thanos-mineware 2016-06-10 12:15:54 +03:00
Thanos Paravantis
b08abf9a73 Apply zombie infection improvements (wip) 2016-06-10 12:13:01 +03:00
Shaun Bennett
e30cd6747b Increase goal 10 million, probably need to change later 2016-06-09 23:40:58 -05:00
Shaun Bennett
1d365d726c brawl fountain now displays proper info on the weekend 2016-06-09 23:40:58 -05:00
Shaun Bennett
08e47b4b1b Enable tips in bonus gui 2016-06-09 22:41:41 -05:00