JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,423 Commits 1 Branch 0 Tags 481 MiB
14e5928b00
Commit Graph

8150 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Shaun Bennett
8bf26dbc11 Use a better podium for NPC, reenable boosters 2016-06-09 18:57:48 -05:00
Shaun Bennett
35e1c2af65 Use rewardCoinsLater for giving shards 2016-06-09 18:19:22 -05:00
Alex-The-Coder
77e9de0f8f Update required rank in 
fountain add help message
 2016-06-09 17:02:00 -05:00
Alex-The-Coder
0306f1d703 Update required rank in 
booster command help message
 2016-06-09 17:02:00 -05:00
Alex-The-Coder
dbe8f39eeb Update required rank in 
add booster help message
 2016-06-09 17:02:00 -05:00
xXVevzZXx
f6b60ad956 fix idle manager to persist teleports and make xp rewards depending on playtime 2016-06-09 15:51:27 -05:00
cnr
ba319599ba Fix fountain schematic file paths 2016-06-09 01:18:09 -05:00
Shaun Bennett
91f6ddce55 Add some minor documentation 2016-06-09 00:48:44 -05:00
Shaun Bennett
611cb28d1a Fix a typo 2016-06-09 00:47:03 -05:00
Shaun Bennett
cade7b4081 Remove got boosters message 2016-06-09 00:43:59 -05:00
Shaun Bennett
d6bce63967 Use schematics from update folder 2016-06-09 00:43:03 -05:00
Shaun Bennett
ece08c23a9 Fix merge issues 2016-06-09 00:40:05 -05:00
Shaun Bennett
699b35995f Merge remote-tracking branch 'remotes/origin/develop' into feature/gems 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
 2016-06-09 00:39:39 -05:00
Shaun Bennett
d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett
83be0d7efe Disable game boosters in arcade 2016-06-09 00:28:48 -05:00
Shaun Bennett
85829d355d Fix command permissions 2016-06-09 00:25:54 -05:00
Shaun Bennett
22bb56dfda Remove game booster button 2016-06-09 00:22:54 -05:00
Shaun Bennett
09d2c00f66 Proper display of extra gem fountain rewards 2016-06-09 00:14:01 -05:00
cnr
cf6e3cf05d Merge branch 'feature/game-variants' into develop 2016-06-08 22:47:16 -05:00
Shaun Bennett
c9d5b91c52 Proper booster activation events 2016-06-08 19:22:25 -05:00
xXVevzZXx
ce8c8543f6 fix game class not beeing added to modable classes 2016-06-09 01:11:19 +02:00
xXVevzZXx
b66b459e05 implement xp multiplier 2016-06-08 23:40:48 +02:00
cnr
d54bed150e Merge branch 'mopple' into develop 2016-06-08 12:59:06 -05:00
xXVevzZXx
1aba217c55 slowly increase spider energy 2016-06-08 12:51:07 -05:00
xXVevzZXx
aa1c599b5e Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM 2016-06-08 12:51:07 -05:00
Shaun Bennett
37a412f1bf Starting to merge boosters into arcade code 2016-06-07 17:24:24 -05:00
xXVevzZXx
9e88174c36 slowly increase spider energy 2016-06-07 00:19:56 +02:00
Sam
7da009d133 Revert "Space in front of disguised player's names when rank = all" 
This reverts commit 3bcfe22835.
 2016-06-06 21:10:51 +01:00
Sam
3bcfe22835 Space in front of disguised player's names when rank = all 
Fixes a small problem where there would be a space in front of a user's
name if they were disguised as a player with a rank of ALL.
 2016-06-06 21:06:40 +01:00
Sam
298c09ab82 Lowercase rank prefixes in tablist when in party 
When in a party the rank prefix in the tablist of every user is now
uppercase.
 2016-06-06 20:45:07 +01:00
Sam
8066eb939a PC-500 
Fixes an issue where players were able to open beacon inventories can
give themselves the buffs from it.
 2016-06-06 18:14:06 +01:00
Thanos Paravantis
7288c4f131 Fix landing detection on cloud fall and improve clouds 2016-06-06 19:40:54 +03:00
TadahTech
474a9dc975 Heavy UI and Command work. Begin testing 
Time: 2hrs
 2016-06-05 23:37:08 -05:00
TadahTech
c577e5827c Heavy UI and Command progress. 
Time: 4hrs
 2016-06-05 22:55:06 -05:00
TadahTech
a9c086172f Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-05 19:06:15 -05:00
TadahTech
ee35dd3442 Redis system implementation and code refactoring. 
Total time: 13hr
 2016-06-05 19:05:29 -05:00
Sam
4b576dbf3c PC-164 
Fixes an issue where players would be able to duplicate items in Bridges
 2016-06-05 23:03:04 +01:00
LCastr0
2410151371 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-05 17:46:27 -03:00
LCastr0
cb71bf4ba5 Removes morphs from gadget persistence (PC-429) 2016-06-05 17:44:34 -03:00
Thanos Paravantis
b9a6fdee24 Fix dragon eggs not disappearing after challenge end 2016-06-05 20:13:32 +03:00
Sam
64ff9f193a PC-403 
Fixes an issue where if a player was in the respawning state in MCL and
their tower was destroyed they would not receive their gold armor
 2016-06-05 15:34:20 +01:00
Sam
2755543686 Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-06-05 15:32:06 +01:00
TadahTech
502111ef4e Redis system needs a shit ton of work. Need to design it better. 2016-06-05 00:42:22 -05:00
TadahTech
4ce9c90839 Party Redis init. 
Wrap for 6/4/2016. Total time: 9.3 hrs.
 2016-06-05 00:32:04 -05:00
TadahTech
8c3d5f66a2 UI work. 2016-06-05 00:03:01 -05:00
TadahTech
d1fb547d09 Files changed that need to be edited later on with the new Party System. 
Memory commit
 2016-06-04 23:02:02 -05:00
TadahTech
e7f4f00433 Files changed that need to be edited later on with the new Party System. 
Memory commit
 2016-06-04 22:56:30 -05:00
cnr
8de5280241 Disable /allowCmd 2016-06-04 22:55:15 -05:00
samczsun
fdf500b090 Allow opening chest in incognito... silently! 2016-06-04 23:54:13 -04:00
samczsun
3444c9c7d7 Remove anti-fly-kick 2016-06-04 23:54:13 -04:00
samczsun
dc419cb53c Add /speed command 2016-06-04 23:54:13 -04:00
samczsun
15a1a63c15 Add try/catch to render map just in case 2016-06-04 23:54:13 -04:00
samczsun
64e1288ba2 Add nullcheck to WarPointEvasion 2016-06-04 23:54:13 -04:00
samczsun
f9826abc1e Make field in MeridianScepter transient 2016-06-04 23:54:13 -04:00
samczsun
dbf61c5652 Set walk speed on join 2016-06-04 23:54:13 -04:00
TadahTech
bccc11eeaf Files changed that need to be edited later on with the new Party System. 
Memory commit
 2016-06-04 22:41:01 -05:00
TadahTech
84f428fa99 Redis work: Command work: UI work: 
Total Time: 2.5hrs
 2016-06-04 21:13:19 -05:00
Ben
1778bd4c28 Final little tweaks to Champions 2016-06-04 18:28:38 +01:00
Sam
05e85523b1 PC-405 
Fixes an issue where players would be able to fill buckets of water in
Bridges and get to the centre before the Bridges has fallen.
 2016-06-04 17:42:30 +01:00
Sam
78c5b8a0a3 PC-402 
Fixes a typo with the BeastMaster kit.
 2016-06-04 17:00:09 +01:00
TadahTech
22a438d5c1 Party system rewrite init. Barebones frame work: Total time - 2hrs. 2016-06-04 01:54:17 -05:00
Sam
981943b38b PC-413 
Fixes an issue where /vanish could be abused during GameState.Prepare
 2016-06-04 00:14:12 +01:00
Sam
f99d4bc14d PC-164 
Fixes an issue where players would be able to duplicate kit items by
giving them to another player then using their "Early game revive"
 2016-06-03 23:29:46 +01:00
xXVevzZXx
5a5a25a799 make "and" bold 2016-06-03 14:15:46 +02:00
Sam
c01b6da390 Staff is incognito could be found using /stats (PC-Bugs-407) 
Fixes an issue where players could do /stats <name> to find out if
vanished players were on their server.
 2016-06-03 13:14:54 +01:00
Sam
1ff06adf18 Rewrite of how /vanish is handled in game servers (PC-Bug-413) 
Fixes all /vanish based issues where players would be not correctly
handled while toggling /vanish in game servers.
 2016-06-03 13:13:19 +01:00
xXVevzZXx
f517954064 edit gem/shard display layout 2016-06-03 14:12:55 +02:00
LCastr0
c5cbca3ed0 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-02 18:30:22 -03:00
Sam
ee10751e23 Players could flip trap doors (PC-Bugs-440) 
Fixes an issue where players would be able to flip trap doors in Dragon
Escape to either troll players or give them an advantage.
 2016-06-02 22:30:18 +01:00
Sam
b51007da91 Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-06-02 22:28:35 +01:00
LCastr0
b3291476cb Changed method names 
Changed kit modifiers to be in an enum instead of creating a new class for each modifier
Implemented kit modifiers in the games
Removed renaming from Widder, Christmas Elf and Pumpling
Changed the persistence to have the system that Connor added
 2016-06-02 18:25:16 -03:00
xXVevzZXx
719ac114d8 change text color 2016-06-02 21:19:54 +02:00
xXVevzZXx
231b55d018 add shards depending on rank 2016-06-02 21:13:12 +02:00
Thanos Paravantis
c1bd25cdbe Merge branch 'develop' into thanos-mineware 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2016-06-02 22:06:59 +03:00
Thanos Paravantis
f86a430266 Use disguisePlayers() and remove clone() method 2016-06-02 22:04:52 +03:00
Thanos Paravantis
daf0247d2d Add brackets to statements 2016-06-02 22:04:00 +03:00
Thanos Paravantis
656c713132 Elevate egg smash score hologram 2016-06-02 22:03:15 +03:00
xXVevzZXx
aa1ea63337 adding shard reward to games 2016-06-02 20:16:36 +02:00
cnr
894b7db18e Remove remaining fake ultra tag artifacts 2016-06-02 02:25:15 -05:00
Sam
eaada4acaf PC-400 
Fixes an issue where items could be placed in item frames and then would
not be able to be retrieved.
 2016-06-01 23:40:03 +01:00
Sam
6a423b571a PC-379 
Fixes an issue where the map selector for Paintball and Snow Fight did
not work in MPS.
 2016-06-01 22:40:07 +01:00
Sam
e6ab50c5b3 Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-06-01 22:04:13 +01:00
Sam
146f878e62 PC-422 
Fixes a not well constructed kit description. (Medic)
 2016-06-01 22:03:13 +01:00
Sam
d83a6cd95c PC-421 
Fixes a typo when a user was reported for an inappropriate build.
"Buildres" to "Builders"
 2016-06-01 21:57:34 +01:00
samczsun
f7adf731a9
Delete query command 2016-06-01 16:17:17 -04:00
Sam
936eb1b978 Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-06-01 15:41:22 +01:00
Sam
b08c2c9467 PC-149 
Fixes an issue where entities wouldn't be removed when a build got a
"Failure" score.
 2016-06-01 15:41:02 +01:00
Sam
4c4363ffaa PC-409 - 2 
Not sure why but it missed out an if statement in the previous commit
 2016-06-01 14:54:23 +01:00
Sam
df9fe45d7e PC-409 
Fixes an issue where the game lobby scoreboard would not account for
players in /vanish.
 2016-06-01 14:51:22 +01:00
cnr
25a315ac05 Revert "Clans optimizations" 
This reverts commit 89da8790bf.
 2016-06-01 00:58:58 -05:00
cnr
750120c106 Prevent developers from using /punish 2016-06-01 00:47:22 -05:00
cnr
84853a1f9a Revert "Update chat-spam message with coupon link" 
This reverts commit dfbb4dca11.
 2016-06-01 00:39:44 -05:00
cnr
825839d853 Fix PlayerKeyValueRepository's exception and return types 2016-06-01 00:38:29 -05:00
Sam
1a9f58451b PC-383 
Fixes the issue where players would not be able to move when joining a
game in Mine-Strike as the GetSpectatorLocation() method would be
outside the map borders.
 2016-05-31 22:35:52 +01:00
Sam
6b70292837 PC-124 
Fixes an issue where if a user did /spec pre-game they would not be
given a Spell-Book in game.
 2016-05-31 20:04:03 +01:00
Sam
d98afaf829 PC-125 
Fixes a small grammatical error where "effect" was used instead of
"affect".
 2016-05-31 19:44:29 +01:00
Sam
6cb275e036 PC-121 
Changed 'a' to 'an' in the text component of the friend menu
 2016-05-31 14:44:18 +01:00
Sam
6a2b43f32d PC-130 
Fixes an issue where you could right click the UHC item in the set game
page which would allow you to have a golden apple in game.
 2016-05-31 14:15:19 +01:00
Sam
c7757117fc PC-148 
Fixes a very trivial issue with Ocelots being named incorrectly
 2016-05-31 13:40:20 +01:00
Sam
3bdc541c9d Debug message removal 2016-05-31 11:12:55 +01:00
Sam
6db4c3acc7 PC-203 
Fixes the issue of "auto-bowing" in OITQ
 2016-05-31 01:46:50 +01:00
Sam
55317730fa Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-05-30 23:21:38 +01:00
Sam
cb2dd508bd PC-413 (Fixed) 
Fixed some aggressive auto-formatting
 2016-05-30 23:21:20 +01:00
Sam
4a0558d5c8 PC-413 
If staff join any game normally with /vanish disabled, then vanish
before the game starts, you still participate in the game except you're
invisible to everyone.
 2016-05-30 23:11:19 +01:00
Alex-The-Coder
abb2729c0e Remove arcade logitech advertisement 2016-05-30 14:46:29 -04:00
Alex-The-Coder
ff415a4569 Remove hub logitech advertisement 2016-05-30 14:44:07 -04:00
Shaun Bennett
4e9a48ab4f Finish off the tip system 2016-05-30 12:02:12 -05:00
xXVevzZXx
365dd0e561 Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM 2016-05-30 14:44:42 +02:00
Thanos Paravantis
b258ec69ac Update Deadly TNT and remove Fishing Day 
Deadly TNT was updated in order to display a cooldown bar until
the next TNT throw, just above the player's inventory.

Fishing Day was removed from rotation as requested.
 2016-05-30 14:54:10 +03:00
Thanos Paravantis
e77bee5cd8 Implement building champion, remove quick climber and enhance chicken attack 
Building Champion achievement was implemented as a replacement
for quick climber achievement, since quick climber is almost impossible
to complete in public games. Build Champion is based on Build Race challenge,
and it requires players to place all blocks in their inventory,
within 15 seconds. Moreover, chicken minions can now attack players,
even if they are stuck in the water.
 2016-05-30 12:51:58 +03:00
Thanos Paravantis
76f161f9ed Update Zombie Infection and Zombie Wrapper 2016-05-30 12:48:07 +03:00
Thanos Paravantis
a918f9067d Add double plant generation and fix life reduction bug 2016-05-30 12:46:04 +03:00
Thanos Paravantis
8ee53c935b Use getPlayersWithRemainingLives() on map creation 
The getPlayersAlive().size() has been replaced with
getPlayersWithRemainingLives(), since during map generation
players have not been reset yet. With that, all players are
selected properly.
 2016-05-30 12:43:35 +03:00
Thanos Paravantis
d11c3c76eb Add chicken attack info message 
Every time chicken attack is triggered for a player, a chat message will
be displayed that explains why the player is being attacked by chickens.

Also, two debug messages were removed, since they were no longer used.
 2016-05-30 12:39:17 +03:00
Shaun Bennett
e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
Shaun Bennett
a1437a3044 Starting to add gui logic 2016-05-28 11:23:26 -07:00
Shaun Bennett
aebcfc2727 Booster tip system 2016-05-28 09:21:10 -07:00
Shaun Bennett
e00009a6d1 Fix CustomTagFix applying to holograms under certain conditions 2016-05-28 09:20:33 -07:00
Shaun Bennett
4bbf39ca1c Update JOOQ files 2016-05-28 08:59:03 -07:00
cnr
dfbb4dca11 Update chat-spam message with coupon link 2016-05-27 13:18:07 -05:00
Sam Sun
59c26bdcd7 Undo leap change 2016-05-27 13:41:49 -04:00
Ben
5899933d8d [Mage/LifeBonds] Make health be taken from your own rather than the nearest player with highest health. [PC-350] 2016-05-27 13:46:06 +01:00
LCastr0
255191f01a Changed gadget persistence to use Player Key/Value system (Thanks to Connor) 
Changed the method names for some classes
 2016-05-26 23:58:36 -03:00
samczsun
84276f68a0 Change help message rank 2016-05-26 14:29:13 -05:00
samczsun
f7e0bc7d16 Don't log if culled is 0 2016-05-26 14:29:13 -05:00
samczsun
0794761435 Forgot a nullcheck 2016-05-26 14:29:13 -05:00
samczsun
f1f464f3a4 Change listener priority again. Fixes PC-209 2016-05-26 14:29:13 -05:00
samczsun
daf1d1a9ba Fix duplication glitch using fissure 2016-05-26 14:29:12 -05:00
Sam Sun
ef0dcdb0df Bump invsee required rank too 2016-05-26 10:24:50 -05:00
Sam Sun
1bf8ccfc43 Bump worldevent required rank 2016-05-26 10:24:50 -05:00
cnr
1c66c10293 Don't create backing tables on startup 2016-05-25 17:59:21 -05:00
cnr
5331e2bec9 Allow PlayerKeyValueRepository Exceptions to propagate 2016-05-25 17:59:20 -05:00
LCastr0
e52ff13712 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-25 12:20:18 -03:00
LCastr0
460cb08f54 Adds old gadget names 
Adds another fix for winroom speed
Moves gadgets to individual packages, easier to manage in a future update
Adds gadget persistence (Or maybe not)
Changed mount locked item data to 8 instead of 7
 2016-05-25 12:19:06 -03:00
cnr
857cf6ad30 Add PlayerKeyValueRepository and BukkitFuture 
PlayerKeyValueRepository<V> is a key/value store whose keys are Strings
and whose value type is parameterized by V. Each repository is backed by
a MySQL table in the Accounts database.

Access to PlayerKeyValueRepository's values is restricted via
CompletableFuture to enforce async database access.

BukkitFuture contains helpful utilities for producing, transforming, and
terminating CompletableFutures with actions on the main thread. A
typical PlayerKeyValueRepository action may look similar to the
following, where we retrieve all key/value pairs for a player and
perform an action with the result on the main thread:

    PlayerKeyValueRepository<String> repo = [...]; // init repo
    UUID uuid = [...]; // a player's UUID

    repo.getAll(uuid).thenCompose(BukkitFuture.accept(values -> {
        // this will be run on the main thread!
        // `values` is of type `Map<String,String>`
    }));
 2016-05-25 08:35:05 -05:00
samczsun
9da9dce398
Fix mimic, allow chests and invite. Fixes PC-375 2016-05-24 16:40:25 -04:00
samczsun
2991bec44d
Fix listener priorities (again). Fixes PC-370 2016-05-24 16:04:15 -04:00
samczsun
2680c2b244
Don't apply attributes on friendlies. Fixes PC-369 2016-05-24 15:58:44 -04:00
samczsun
9af2c7e9f4
Restore hunger after Hold. Fixes PC-334 2016-05-24 15:38:18 -04:00
samczsun
9acdbd7cbe
Don't allow placing banners and string. Fixes PC-333 2016-05-24 15:38:03 -04:00
Sam Sun
9853ef824e QA Pass #2 - Comment WorldManager, optimize searching 2016-05-24 12:24:14 -05:00
AlexTheCoder
b952de856e Add a description for the Magnetic Maul and switch ConcurrentHashMap to HashMap in the Meridian Scepter 2016-05-24 13:15:29 -04:00
samczsun
f32e648691 QA Pass #1 
Remove potential main thread IO in ItemMapManager
Don't construct search string if limit is reached
Also cleaned up WorldManager to be more efficient
 2016-05-24 13:15:29 -04:00
samczsun
2f993dbe66 Fix Wind Blade, Hyper Axe 2016-05-24 13:15:29 -04:00
samczsun
4ba3148df7 Finish invsee 2016-05-24 13:15:29 -04:00
samczsun
ec0e1b9849 New invsee implementation 2016-05-24 13:15:29 -04:00
samczsun
63e3cc8e12 Add nullcheck 2016-05-24 13:15:29 -04:00
samczsun
d8b5dba3fc Fix Meridian Scepter 2016-05-24 13:15:29 -04:00
AlexTheCoder
1dc5a0d712 Revamped Meridian Scepter attack 2016-05-24 13:15:29 -04:00
samczsun
516ad5a640 Check cancellation before continuing Takedown. Fixes PC-277 2016-05-24 13:15:29 -04:00
samczsun
72a2aa926f Change event priority again. Fixes PC-216 2016-05-24 13:15:29 -04:00
samczsun
981bed5e37 Limit clan searching. Fixes PC-331 2016-05-24 13:15:29 -04:00
samczsun
e0f4c9cbc8 Update Broadsword regen 2016-05-24 13:15:29 -04:00
samczsun
14c60ec3ba Delay recall by one tick. Fixes PC-328 2016-05-24 13:15:29 -04:00
samczsun
51c9301799 Consider leap level. Fixes PC-330 2016-05-24 13:15:29 -04:00
samczsun
41846f835d Bump listener priority, change wording. Fixes PC-308 2016-05-24 13:15:29 -04:00
samczsun
c172d226c4 Add bypass for testing servers to skip tutorials 2016-05-24 13:15:29 -04:00
samczsun
08784d3f0a Ignore float kick for Wind Blade. Fixes PC-314 2016-05-24 13:15:29 -04:00
samczsun
786c60537e Remove /c trust from help. Fixes PC-280 2016-05-24 13:15:29 -04:00
Sam Sun
cd0e59087a Don't drop items from hidden slimes. Fixes PC-276 2016-05-24 13:15:29 -04:00
samczsun
9141ed645a Fix fissure anvil repair exploit. Fixes PC-312 2016-05-24 13:15:29 -04:00
samczsun
ea43dca9af Don't allow placing TNT in tutorial. Fixes PC-307 2016-05-24 13:15:29 -04:00
samczsun
d29d5dd5e4 Actually fix PC-279 2016-05-24 13:15:29 -04:00
samczsun
89da8790bf Clans optimizations 
Key notes:
* RAM usage decreased on startup
* Startup speed much quicker
* Map is entirely rendered on startup

Details:
Changed TutorialWorldManager Stack -> LinkedList because no need for
synchronization
Documented map methods and magic numbers
Remove loading all chunks on startup
Render map on startup
Optimize map rendering by replacing ArrayList with LinkedList
Optimize map rendering by reading chunk directly from disk and caching to
prevent entity ticking
Optimize map rendering by using a global BlockPosition
Save results for showing zoom
 2016-05-24 13:15:29 -04:00
samczsun
7c66c98338 Clean up Farming 2016-05-24 13:15:29 -04:00
samczsun
173a6bb143 Delete IncognitoHidePlayerEvent 2016-05-24 13:15:29 -04:00
samczsun
2675789f59 Compare commands with equals. Fixes PC-116 2016-05-24 13:15:29 -04:00
Ben
1e0b94d870 [BlockHunt,Wizards,Champions] Disable particle effects [PC-156] 2016-05-24 12:08:18 +01:00
Ben
bad9077144 [Ranger/VitalitySpores] Change to if you take damage and then go 10 Seconds without taking more damage, you will receive Regen 2 for 6(+1 pl) Seconds; if you take damage during that regen you lose it [PC-354] 2016-05-24 11:09:05 +01:00
Shaun Bennett
434ada2e86 Fix merge issues 2016-05-24 19:14:52 +10:00
Shaun Bennett
1377e6724f Merge with develop 2016-05-24 19:10:55 +10:00
Shaun Bennett
b6376cae2f Remove googles http api (no longer needed) and add apache http to core.common 2016-05-24 17:23:17 +10:00
Shaun Bennett
12c5ba80b7 API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation 2016-05-24 17:13:33 +10:00
Ben
bc3ec4088a [Ranger/Sharpshooter] Missing two shots causes the damage bonus to reset. [PC-352] 2016-05-24 01:16:11 +01:00
Ben
5791cc5dec [Assassin/Evade] Buff the skill in multiple ways [PC-355] 2016-05-24 01:15:29 +01:00
Ben
8bb9811a80 [Assassin/Blink] When de-blinking set the rotation of the player to the rotation that was present at the time of the de-blinking rather than the rotation of the player when they blinked. [PC-359] 2016-05-24 00:28:48 +01:00
Ben
243044b921 [Skill/Assassin] Remove Rest & Fitness from. [PC-358 AND PC-357] 2016-05-24 00:25:32 +01:00
Ben
5448c42e45 [Assassin/Recall] Don't allow use when in water [PC-360] 2016-05-23 23:46:33 +01:00
Ben
609aa5177a [Ranger/WolfsPounce] Lower damage [PC-353] 2016-05-23 23:45:42 +01:00
Ben
8da4ac3135 [Brute/FleshHook] Deal more damage/pull velocity when charging up more [PC-340] 2016-05-23 23:42:12 +01:00
cnr
494eafb97f Use file.mineplex.com for resource packs 2016-05-23 07:52:22 -05:00
LCastr0
3ad7fc5f21 Adds old Mr.Punchman name 
Adds another fix for winroom speed
 2016-05-22 21:46:22 -03:00
Ben
e5b8636298 [Mage/Immolate] Do not allow use whilst in water [PC-351] 2016-05-23 01:23:08 +01:00
Ben
d019d27d23 [Mage/Blizzard] Increase energy usage. [PC-347] 2016-05-23 01:22:39 +01:00
Ben
af2eef5afe [Mage/Inferno] Increase energy usage [PC-348] 2016-05-23 01:22:15 +01:00
Ben
02dc9ca3f9 [Brute/DwarfToss] Fix the water check being in the wrong location [PC-336] 2016-05-23 01:21:47 +01:00
LCastr0
ed68ef332b Fixes for Win Room (Players were able to see other players) 
Added command to allow other players to run ranked commands
Fixes code styles
 2016-05-22 21:05:48 -03:00
Ben
48e998f630 [Knight/HiltSmash] Lower damage (previous commit for this ticket for some reason did not contain the lowered damage) [PC-343] 2016-05-23 01:01:27 +01:00
Ben
d8a3ebc704 [Knight/AxeThrow] Lower damage and increase recharge time. [PC-345] 2016-05-23 00:59:11 +01:00
Ben
2138330c70 [Brute/DwarfToss] Move Invulnerability condition appliance outside of the 5 tick delay as that allowed players to get attacked right after being thrown. [PC-336] 2016-05-23 00:57:46 +01:00
Ben
be007cd62f [Knight/Swordsmanship] Change my previous commit for this skill a little bit, as it was clarified to be slightly different than I understood it to be. [PC-341] 2016-05-22 20:52:34 +01:00
Ben
ceab00f979 [Brute/BlockToss] Change recharge time and remove redundant null check. [PC-338] 2016-05-22 20:51:22 +01:00
xXVevzZXx
c984bbfc8a make it possible to add stats to the brawl games 2016-05-22 00:29:58 +02:00
LCastr0
92b6abc884 Fixes merging bugs 2016-05-20 23:53:27 -03:00
LCastr0
0109e2f2dd Fixes for Illuminated chest 
Fixes for /check command (Support)
 2016-05-20 23:33:58 -03:00
Ben
e701e0c0db [Mage/IcePrison] Lower the per level lasting time of ice. [PC-349] 2016-05-21 00:46:57 +01:00
Ben
383f9005e1 [Mage/MagmaBlade] Lower damage [PC-346] 2016-05-21 00:44:16 +01:00
Ben
b1933eddc7 [Brute/BlockToss] Increase recharge time and fix the held block hitbox blocking the holder from getting attacked. [PC-338] 2016-05-21 00:22:57 +01:00
xXVevzZXx
f5d0f5209e decrease bridge fall time and instant kill on map leave in op bridges and disable health regain in gladiators champions after poison is active 2016-05-21 00:29:04 +02:00
xXVevzZXx
28901f378a fix up speed bridges item give out 2016-05-20 23:27:49 +02:00
xXVevzZXx
0fb84e57c1 Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2016-05-20 23:26:54 +02:00
Thanos Paravantis
d1f94bcba5 Apply minor changes to block lobbers challenge 2016-05-20 23:12:23 +03:00
Thanos Paravantis
e45134f8d5 Fix treasure digger map creation 2016-05-20 20:39:14 +03:00
Ben
55b0ed8eb5 [Knight/HiltSmash] Change base damage from 3 to 2 [PC-343] 2016-05-20 15:50:33 +01:00
Ben
8ba2132f81 [Knight/Swordsmanship] Buff base from 1 charge to 2 charges. [PC-341] 2016-05-20 15:49:57 +01:00
Ben
07c5e16e44 [Brute/Intimidation] Update lore to match the new damage distance [PC-337] 2016-05-20 15:07:57 +01:00
Thanos Paravantis
c828d37189 Rename InfestationZombie to ZombieWrapper 2016-05-20 13:34:21 +03:00
Thanos Paravantis
1dffc9b78e Modify hologram height gain 2016-05-20 13:26:38 +03:00
Thanos Paravantis
745198d59e Refactor punch the pig challenge 2016-05-20 13:25:30 +03:00
Ben
0883937316 [Knight/Riposte] Change base recharge from 10s to 14s [PC-342] 2016-05-20 11:06:23 +01:00
Ben
6020881af2 [Brute/CripplingBlow] Change knockback modifier from -50% to -25% [PC-339] 2016-05-20 11:03:15 +01:00
Ben
9154848ed9 [Brute/FleshHook] Lower base damage. [PC-340] 2016-05-20 10:23:45 +01:00
Ben
53fcab596a [Brute/Intimidation] Lower range boost per level. [PC-337] 2016-05-20 10:17:59 +01:00
cnr
6b7cfd3eaa Merge branch 'develop' into project-cosmetics 2016-05-20 03:23:46 -05:00
cnr
d6750c7d91 Disable /unlockCosmetics on production servers 2016-05-20 03:23:27 -05:00
LCastr0
22fb507871 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-20 05:14:29 -03:00
LCastr0
c58e0f3e30 Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics) 2016-05-20 05:11:59 -03:00
Shaun Bennett
efb264dd75 Hook into Booster API 2016-05-20 16:58:58 +10:00
xXVevzZXx
ef164091b8 make small Adjustments to gamemodes, make a fix for Absorbtion hearts and fix format 2016-05-20 02:39:19 +02:00
Ben
d52262c3fc (Dwarf Toss) Add short invincibility for thrown players. Don't allow use in water. [PC-336] 2016-05-20 01:25:02 +01:00
Ben
dc7ea4e9c7 Brute Takedown skill nerf [PC-335] 2016-05-20 01:09:46 +01:00
cnr
f76b3f7d70 Freeze players when preparing for Master Builders. Fixes PC-127 
This prevents players from quickly flying to other players' areas before
the game starts.
 2016-05-19 18:02:46 -05:00
cnr
4351f6f1f0 Prevent muted MPS (co-)hosts from using /bc. Fixes PC-113 2016-05-19 18:02:46 -05:00
cnr
2ae6859e65 Apply slowness to Infiltrators in enemy spawn area. Fixes PC-185 2016-05-19 18:01:44 -05:00
cnr
419bf2a755 Fix mining drops in Bridges. Fixes PC-133 
This change prevents players from using inadequate tools to mine ores,
e.g., using a stone pickaxe or fists to mine diamond ore.
 2016-05-19 18:01:27 -05:00
Thanos Paravantis
28f1d45b1c Update achievement category game enum 2016-05-19 20:55:22 +03:00
Thanos Paravantis
472d3881a0 Merge branch 'develop' into thanos-mineware 2016-05-19 20:49:45 +03:00
Thanos Paravantis
87c8c7efa4 Merge branch 'master' into thanos-mineware 2016-05-19 20:42:43 +03:00
Thanos Paravantis
7e40141794 Fix spectators being teleported to map center 2016-05-19 20:40:13 +03:00
cnr
7f44281441 Merge branch 'develop' into project-cosmetics 2016-05-19 10:04:19 -05:00
cnr
18daf45298 Prevent wither assault spectators from reviving teammates. 
This is a fix in the same vein as PC-103 (c7970d1), but applied to the
Wither Assault game
 2016-05-19 09:51:21 -05:00
Shaun Bennett
012edfed45 Use loaded schematics to display fountain progress 2016-05-18 18:04:21 +10:00
Shaun Bennett
8d7ef7cc9a Fix UtilBlock setting ghost blocks 2016-05-18 18:03:54 +10:00
LCastr0
11db05b6bf Fixes spelling of MineStrike gun 
Fixes spectators not being sent to the

winroom
 2016-05-18 03:58:50 -03:00
Shaun Bennett
e3833b95ad Update Gem Fountain purchase gui 2016-05-18 15:59:04 +10:00
TadahTech
3479d6e318 Fix incognito. 2016-05-17 18:12:05 -05:00
TadahTech
38a0b593ee Fix height for 1.9 and 1.8 users. 
*Thanks QA for not fully testing*....
 2016-05-17 18:11:28 -05:00
TadahTech
51fd23ff84 Patch Bomber dupe glitch in Bridges in a better fashion. 
Fix MCL Head Hunter  achievement.
 2016-05-17 18:11:11 -05:00
Ben
35c7b9a2bd Incognito Updates: 
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
 2016-05-17 18:10:07 -05:00
Ben
8a75a5098c Remove hub invisibility preference for all but Admins and higher. 2016-05-17 18:08:01 -05:00
Ben
014ce137fc If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this. 2016-05-17 18:03:18 -05:00
Ben
6760c07e6c Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa. 2016-05-17 18:00:20 -05:00
xXVevzZXx
6e9b0e4fa5 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
 2016-05-17 14:41:17 +02:00
cnr
6042be2d2f Refactor clans ban functionality and remove UtilStreams 2016-05-17 05:57:27 -05:00
cnr
f5cf751622 Revert "Temporarily disable clans ban functionality" 
This reverts commit b47c49d93b.
 2016-05-17 05:51:18 -05:00
TadahTech
43cadf564e Fix Carl the Creeper. Fix Bridges TNT exploit. 2016-05-16 22:03:27 -05:00
samczsun
1fc4239b89 Determine whether Ice Prison target is valid. Fixes PC-281 2016-05-16 15:44:22 -05:00
Alex-The-Coder
1497662b2e Restrict help display for main Game Command 2016-05-16 03:16:26 -04:00
William Burns
4633b99ad4 Don't block QA from testing, whoops. 2016-05-16 08:07:42 +01:00
LCastr0
fb63b3a1a4 Fixes for winroom command, and illuminated chest 2016-05-15 22:49:10 -03:00
LCastr0
42eef838b3 Fixes podium not being enabled by default 2016-05-15 21:33:36 -03:00
xGamingDudex
a27a618b2f Made debugging tools only available on test servers 2016-05-16 02:04:15 +02:00
xGamingDudex
816a7ca232 Re-Activated chest buttons 2016-05-16 01:57:58 +02:00
xGamingDudex
d92ad9c53f Made illuminated chest purchasable and added appropriate lore 2016-05-16 01:51:40 +02:00
LCastr0
511726f72a Treasure chest coin checker for test servers 2016-05-15 20:43:46 -03:00
xGamingDudex
4ebf48bd45 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-05-16 01:34:08 +02:00
xGamingDudex
8ad7646128 Edits to treasure chests 2016-05-16 01:33:54 +02:00
xGamingDudex
f8d5bd3c11 Fixed treasure chests 
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
 2016-05-16 00:51:33 +02:00
LCastr0
09b7fbdbbe Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-15 18:48:00 -03:00
LCastr0
4f79ec6551 Pinata fixes 2016-05-15 18:47:09 -03:00
xGamingDudex
b4aad690e5 Fixed some rewards and added party trail to chests 2016-05-15 23:31:10 +02:00
xGamingDudex
fdf167953f Fixed emerald set order 2016-05-15 23:30:17 +02:00
xGamingDudex
ca556f7846 Fixed win room would not sort player properly for solo games 2016-05-15 23:29:58 +02:00
xGamingDudex
7073ba4e6a Fixed gadgets in the win room 2016-05-15 23:29:24 +02:00
xGamingDudex
1e6dda2d7d Cleaned up some win effect backend code & fixed kits working in winroom 2016-05-15 23:28:12 +02:00
xGamingDudex
14f7e64a77 Fixed Animator and removed duplicate test call in Game.java 2016-05-15 21:05:37 +02:00
xGamingDudex
d850bed725 Minor code tweaking 
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
 2016-05-15 19:43:07 +02:00
xGamingDudex
29a0ba565b Added better hollow calculations to ShapeBox and UtilBlock 2016-05-15 17:05:11 +02:00
xGamingDudex
296f304d29 Changed the way UtilItem.dropItem handles despawning 2016-05-15 17:04:50 +02:00
xGamingDudex
a8db293bcf Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape 2016-05-15 17:04:25 +02:00
xGamingDudex
97f82e422d Merge branch 'project-cosmetics' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
 2016-05-15 16:03:36 +02:00
xGamingDudex
aa36097729 Made Animator abstract and added final modifiers 2016-05-15 15:58:05 +02:00
xGamingDudex
22e54557d8 Fixed cleaning method for WineffectRiseOfTheElderGuardian 
The class contained commented code, removed when debugging
 2016-05-15 15:33:42 +02:00
xGamingDudex
abddc446fd Added java docs and tweaked code 
* Fixed possible duplication bug in MulitBlockUpdaterAgent
* Tweaked some of the factor methods for Shape.java
* Cleaned some code in ShapeWings.java
 2016-05-15 15:32:44 +02:00
xXVevzZXx
44e52f4b5b Add javadoc to added files 2016-05-15 10:24:29 +02:00
phobia
a67fec95fc Remove ultra tag 2016-05-15 03:21:58 -05:00
xXVevzZXx
a1a6abc1ca Add champions gladiators and fix tiny winners typo 2016-05-15 10:13:06 +02:00
LCastr0
1cc44d1b3e Fixes for the following classes: 
KitGameModifier
KitModifierType
MultiBlockUpdaterAgent
Shape
GadgetManager
KitModifierType
HatLovestruck
HatSecretPackage
SetLove
Animator
AnimatorEntity
AnimationPoint
ICosmeticShape
UtilText
KitGameModifier
KitModifierType
Removed build.xml and org.eclipse.jdt.ui.prefs
 2016-05-15 00:20:07 -03:00
xGamingDudex
24f7a4b409 Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards 2016-05-14 18:53:09 +02:00
samczsun
b2e92fdf15 Don't pass on INTERACT_AT as INTERACT. Fixes PC-114 2016-05-14 09:42:28 -05:00
LCastr0
20b9f428b4 Fixes Illuminated Chest's Lore 
Fixes Pinata Burst not being saved
Fixes AWP Asiimov and XM1014 Tranquility materials
Removes Fireworks WinRoom
Changes prices of things from 1 shard to Treasure Chest
More unused imports removed
Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN
Adds javadoc to UtilColor.applyColor()
Adds javadoc to UtilColor.getNextColor()
defaultLeatherColor -> DEFAULT_LEATHER_COLOR
Adds suggestions for UtilColor
Adds final modifier to _worldBorders (UtilPlayer)
Changed _worldBorders key from String to UUID
Adds suggestion for UtilPlayer
Adds final modifier to _type (GameModifierSubPage)
Adds final modifier to _type and _kitType (KitGameModifierPage)
DefaultDencity -> DefaultDensity (Shape)
Changed <Vector> to <> (Shape)
dencity -> density (ShapeBox, ShapeGrid, ShapeSphere)
Using speed and count in constructor (ShapeWings)
Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent)
Adds final modifier to all fields (AnimationPoint)
 2016-05-14 01:18:37 -03:00
Shaun Bennett
b802cdec6d Rename shop to "Fountain Keeper" 2016-05-14 14:01:28 +10:00
xXVevzZXx
63c44afa10 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 2016-05-13 22:05:27 +02:00
xXVevzZXx
df5c628c35 add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown 2016-05-13 20:23:04 +02:00
xGamingDudex
0544e86cb1 Started fixing the stat tracking for MS knife 2016-05-13 02:39:43 +02:00
xGamingDudex
2cc609b67e Moved some rewards from normal to valentines 2016-05-13 01:28:26 +02:00
xGamingDudex
35ab155756 Removed unnecessary lore from minestrike game modifiers 2016-05-13 01:20:06 +02:00
xGamingDudex
d34f77a381 Moved some rewards from normal to winter chest 2016-05-13 01:19:06 +02:00
xGamingDudex
9c2c415eb2 Fixed the emerald trail leaving from idle to moving 2016-05-13 01:14:00 +02:00
xGamingDudex
3bb3821fa9 WinEffect gadget disable and MineStrike name and data update 2016-05-13 01:04:35 +02:00
xGamingDudex
4958ab8149 Bug Fixes 
* Fixed Menu page adding glow to win effects if game modifiers were
active
* MineStrike skins were not properly applying material and data
* Skinned knife was not dealing damage
 2016-05-13 00:38:56 +02:00
xGamingDudex
06e583c05e Added flat podium to Firework and Punchman 2016-05-12 23:50:41 +02:00
xGamingDudex
956d64d750 Git Merge Import Fix 2016-05-12 23:46:39 +02:00
xGamingDudex
29d4db0bfd Merge branch 'project-cosmetics' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
 2016-05-12 23:46:17 +02:00
xGamingDudex
2db98613ab Cosmetic Update 
* Redid the Reward manager
	Added new rewards to the chest and changed some values
* Fixed some MineStrike skin bugs
* Removed particles/death effects from Minestrike
* Removed old test minestrike skins
* Moved minestrike skins to correct package
* Changed the illuminated chest animation a bit
* Fixed other minor bugs
 2016-05-12 23:42:37 +02:00
AlexTheCoder
fab24e2139 Allow admins to be opped on testing servers 2016-05-12 17:24:37 -04:00
LCastr0
6f4c6bc545 Fixes counter on WindUp suit 
Removes kit modifier categories
 2016-05-12 15:00:43 -03:00
Sam Sun
2ae072f5b7 Rename modules to correct name 2016-05-12 11:44:35 -04:00
Alex-The-Coder
05312a9bef Update where players spawn upon first join... 
...to avoid flight kick upon login
 2016-05-11 21:57:42 -04:00
xGamingDudex
276f572009 Merge branch 'project-cosmetics' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
 2016-05-10 20:21:37 +02:00
xGamingDudex
1b0b9a894b Tweaked some cosmetics 
* Changed Party Death to firework icon
* Removed idle spark from Emerald Trail
* Changed wing style to pixie from angle on infernal wings
* Added black dots to YinYang

Started some work on the RewardManager
 2016-05-10 20:20:44 +02:00
LCastr0
4fada6de49 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-10 12:45:22 -03:00
LCastr0
5b8ff933b1 Removed more unused imports 
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
Fixed set descriptions
Added 'Comming soon...' to set bonuses
 2016-05-10 12:44:45 -03:00
Conrad
8eba2c9ccb Merge pull request #59 from Mineplex-LLC/feature/logitech-brand 
Move billboard up 1
 2016-05-09 11:55:22 -04:00
AlexTheCoder
7932258579 Move billboard up 1 2016-05-09 03:44:16 -04:00
AlexTheCoder
de1fabf53d Disable report system as it is not ready to go live 2016-05-09 02:10:51 -04:00
cnr
4aa44cd796 Merge branch 'develop' into clans/beta 2016-05-08 16:53:48 -05:00
Keir Nellyer
7c80c3826b Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-05-08 21:49:16 +01:00
Conrad
ac86f3ac8c Merge pull request #55 from Mineplex-LLC/alex-mcl 
Change the visuals of the Billboards and of ELO's display in the stat…
 2016-05-08 13:29:23 -04:00
AlexTheCoder
34e8d65f4d Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly 2016-05-07 21:16:12 -04:00
cnr
b47c49d93b Temporarily disable clans ban functionality 
This can be reverted when clans bans are properly audited/fixed/tested.
 2016-05-07 19:02:19 -05:00
Keir Nellyer
b68127b111 Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-05-08 00:37:59 +01:00
Keir Nellyer
b1a41c3cb3 Make chat abuse colour easier on the eyes 
Dark blue [bold] is hard to read, dark aqua [bold] should be easier
to read.
 2016-05-07 22:48:49 +01:00