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

3729 Commits

Author SHA1 Message Date
Shaun Bennett
ea551182b6 Make booster gui smaller 2016-06-16 15:29:05 -05:00
Sam
ce23a94f3f PC-550 
Fixes an issue where players would be able to interact with blocks on
other people's islands in Speed Builders
 2016-06-16 12:25:21 +01:00
Sam
1d3e12dfb6 PC-574 
Fixes an issue where staff in vanish would be placed in the game after
each round.
 2016-06-16 12:10:39 +01:00
Sam
c3a18813ee PC-555 
Fixes an issue where vanished players would show up in the "Give
Co-Host" and "Remove player" menus in MPS.
 2016-06-16 11:39:51 +01:00
Sam
9e75cc6224 Fixes incorrect item in OITQ 
Players should now get the stone sword that is intended with the leaper
kit, assuming it was some merge or pushing error.
 2016-06-16 11:12:16 +01:00
Thanos Paravantis
ce7bb82d67 Update blockBreakEffect and replace old methods 2016-06-16 12:48:28 +03:00
Thanos Paravantis
49fa3377fc Update Lava Run challenge 
This update includes bug fixes and improvements for Lava Run.

- Fixed obsidian staying in the map after the challenge has ended.
- Obsidian block now appears after the challenge has started,
so players cannot spot it before the challenge starts.
- Added block break particle when the obsidian changes position.
- Players can no longer be damaged from the lava
(damage is now disabled on all challenges when they end).
- Minor performance update.
 2016-06-16 12:37:31 +03:00
TadahTech
e7d76e2ef4 Hot fixes. 2016-06-16 03:56:32 -05:00
samczsun
d6d8d288ca
Prevent TNT duping in Bridges. Fixes PC-132 2016-06-15 22:10:43 -04: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
2421fd1cfe Update booster page, proper booster rewards 2016-06-10 19:40:27 -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
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
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
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
xXVevzZXx
f6b60ad956 fix idle manager to persist teleports and make xp rewards depending on playtime 2016-06-09 15:51:27 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
4bbf39ca1c Update JOOQ files 2016-05-28 08:59:03 -07: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
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
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
Shaun Bennett
1377e6724f Merge with develop 2016-05-24 19:10:55 +10:00
cnr
494eafb97f Use file.mineplex.com for resource packs 2016-05-23 07:52:22 -05: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
xXVevzZXx
c984bbfc8a make it possible to add stats to the brawl games 2016-05-22 00:29:58 +02: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
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
xXVevzZXx
ef164091b8 make small Adjustments to gamemodes, make a fix for Absorbtion hearts and fix format 2016-05-20 02:39:19 +02: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
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
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
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
TadahTech
43cadf564e Fix Carl the Creeper. Fix Bridges TNT exploit. 2016-05-16 22:03:27 -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
xGamingDudex
a27a618b2f Made debugging tools only available on test servers 2016-05-16 02:04:15 +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
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
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
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
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
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
AlexTheCoder
de1fabf53d Disable report system as it is not ready to go live 2016-05-09 02:10:51 -04:00
xGamingDudex
e04a897488 Added some pre-animation to chicken win effect. Removed some comments. 2016-05-06 21:58:31 +02:00
Shaun Bennett
93c2886601 Add boosters to inventory menu 2016-05-06 13:31:59 +10:00
xXVevzZXx
9f2189d173 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2016-05-06 03:40:00 +02:00
xGamingDudex
17a4517e71 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
 2016-05-05 21:03:15 +02:00
xGamingDudex
1a96ea3c18 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-05-05 20:29:28 +02:00
xGamingDudex
db21c7dd22 EGit FTW! 
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....

This should have been part of prev commit.
 2016-05-05 20:26:00 +02:00
Keir Nellyer
a663cb3e01 Revert "Revert "Report system (version 1)"" 
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-05-04 15:24:29 +01:00
Thanos Paravantis
e7f97fa5b8 Move life related methods to challenge class 2016-05-04 16:21:14 +03:00
Thanos Paravantis
9d53eddabd Fix lives amount display and remove disguises 2016-05-04 15:40:43 +03:00
Thanos Paravantis
703e957156 Fix volley pig health and knockback message 2016-05-04 15:38:18 +03:00
Thanos Paravantis
2b362ee4f1 Fix egg smash eggs sometimes stay on the map 2016-05-04 15:37:16 +03:00
AlexTheCoder
0e509898ec Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system 2016-05-03 21:07:50 -04:00
LCastr0
cfc6f3703d Merge pull request #50 from Mineplex-LLC/develop 
Merge from develop
 2016-05-03 13:24:32 -03:00
xXVevzZXx
838cc2ce31 fix enchantments and increase arrow amount in gladiators 2016-05-02 23:01:59 +02:00
xXVevzZXx
8dd89d9dea fix minor bugs and improve minor things in bridges, sg, uhc, quiver, runner and skywars 2016-05-02 20:27:43 +02:00
LCastr0
055b8684c2 - Added action bar message when booster is ready (Wind Up Suit) 
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
 2016-05-02 00:13:06 -03:00
xXVevzZXx
71f8640189 implement Dukes of decoration, OP Gladiators, Countdown, Heroes of the ewe, OP Skywars, Ultra spleef, Assassins and Blood diamonds 2016-05-02 01:06:00 +02:00
xXVevzZXx
6c2caac800 fix some format issues and implement God battles 2016-05-01 19:43:42 +02:00
xXVevzZXx
7bd6cdb93c Implement Lists and Maps into the variable system and finish more gamemodes 2016-05-01 18:48:07 +02:00
AlexTheCoder
070326e72d Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding 2016-04-30 19:26:16 -04:00
Conrad
d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Conrad
e0e30a8b7f Merge pull request #43 from Mineplex-LLC/alex-mcl 
Fix Async Elo Ranked Bans
 2016-04-30 14:46:49 -04:00
AlexTheCoder
41e26f283c Fix all async elo ranked ban methods and switch to callback system for API hooks 2016-04-30 14:10:09 -04:00
Keir Nellyer
6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-29 23:42:27 +01:00
Keir Nellyer
81cebc4ce7 Swap static helpers for a much better solution 
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.

Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
 2016-04-29 23:37:40 +01:00
Thanos Paravantis
89bd325c81 Fix continuous milking sound on milk a cow 2016-04-29 14:35:48 +03:00
Thanos Paravantis
aff5396384 Prevent death effect armor stand modification 2016-04-29 13:41:16 +03:00
Shaun Bennett
184d247fc9 Start adding BoosterPage. Move Boosters to core to support UI's 2016-04-29 17:37:34 +10:00
AlexTheCoder
2887630cf8 - Added javadoc headers 2016-04-28 21:11:38 -04:00
TadahTech
680e579223 Merge Alex's branch into mine. 
Convert to Java 8
Remove unneeded comments.
 2016-04-28 19:39:24 -05:00
AlexTheCoder
156982460f - Fixed water permanently [MCL] 
- Fixed team balancing [MCL]
- Fixed overjoining [MCL]
- Changed bans for quitting ranked matches [MCL]
 2016-04-28 20:03:09 -04:00
AlexTheCoder
b105ccb5f1 - Change event priority 2016-04-28 17:48:16 -04:00
AlexTheCoder
b13528ed66 - Further blockage of creating source blocks [MCL] 2016-04-28 17:46:57 -04:00
AlexTheCoder
3f9ef24235 - Removed debug message 2016-04-28 17:44:37 -04:00
Thanos Paravantis
8874b52b39 Merge branch 'develop' into thanos-mineware 2016-04-28 19:27:56 +03:00
Thanos Paravantis
6084d04a0f Commit before pulling from develop 2016-04-28 19:23:21 +03:00
Thanos Paravantis
992e150608 Refactor and comment classes 
New javadoc comments have been added to describe class functionality
and variable usage on specific places.
 2016-04-28 16:54:46 +03:00
Thanos Paravantis
3a5ec7dc5d Continue refactoring and comment main class 2016-04-28 13:11:27 +03:00
Thanos Paravantis
6cc8f854c4 Refactor main game class 2016-04-28 13:02:44 +03:00
Thanos Paravantis
3161cd53e9 Apply new format on floating holograms 2016-04-28 12:31:09 +03:00
AlexTheCoder
189296a586 - Fixed using water in restricted zones in MCL 
- Implemented Elo in /stats menu
 2016-04-28 00:53:04 -04:00
AlexTheCoder
46f873634e - Decrease time till Overtime in MCL 
- Block ability to flood in MCL
 2016-04-28 00:33:36 -04:00
AlexTheCoder
b4c5be81f3 - Fixed random weather in MCL 
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
 2016-04-27 23:12:38 -04:00
William Burns
d90e9e7dff Add a system for allowing all players to use game commands when in the correct mode. 2016-04-27 20:54:52 +01:00
Thanos Paravantis
aff4b6b270 Fix minecart dance double life loss 2016-04-27 22:09:06 +03:00
xXVevzZXx
1b5b18c9b2 Prevent exception while adding variables to gamemodes 2016-04-27 17:50:01 +02:00
xXVevzZXx
aa219ec3e5 Implement gamemode feature with modifiable variables and working on first moded games 2016-04-27 17:42:50 +02:00
Thanos Paravantis
ddad17855f Improve chicken spawning on chicken shooting 2016-04-27 18:37:42 +03:00
Thanos Paravantis
f8ff99fc58 Increase hologram height gain and expire time 2016-04-27 18:37:09 +03:00
Thanos Paravantis
e3a6a0a50a Fix spawns and map generation on smash off 2016-04-27 18:36:16 +03:00
Thanos Paravantis
c6b1065c4e Fix scoreboard player team after death 2016-04-27 18:35:39 +03:00
Thanos Paravantis
9407265c73 Display predefined items on diamond hunt 2016-04-27 14:02:43 +03:00
Thanos Paravantis
ba5d06db88 Fix tag master and achievement progress 2016-04-27 13:14:20 +03:00
AlexTheCoder
a16145479e - Disabled picking up lava 
- Leaving ranked matches temp bans players from rejoining them
 2016-04-27 03:18:44 -04:00
Thanos Paravantis
ccebeb75f1 Implement challenge team spawning 
Team based challenges are now handled differently from the normal ones.
When the game or challenge starts, instead of spawning all players
with the default team spawn method, they are teleported according
to their team. For example, if a player is on the blue team, he
will be teleported on the blue side of the map. Moreover, teams
are now generated properly, by diving the total number of players by
two. One drawback, that will be fixed in a next commit, is that team
challenges require an even amount of players.
 2016-04-27 09:41:02 +03:00
xGamingDudex
38d03b8468 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-04-27 00:03:29 +02:00
xGamingDudex
79f210e242 Schematic and WinEffect update 
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
 2016-04-27 00:01:30 +02:00
Thanos Paravantis
38769d9616 Add missing tracker classes 2016-04-25 23:01:41 +03:00
Thanos Paravantis
d945bfa17a Fix array out of bounds on veteran tracker 2016-04-25 23:01:17 +03:00
Thanos Paravantis
d0336be7b7 Add new achievements and modify current ones 2016-04-25 22:59:24 +03:00
Thanos Paravantis
41ef1a757c Prevent null winner on veteran tracker 2016-04-25 18:03:25 +03:00
Thanos Paravantis
7c92971346 Remove new thread and use bukkit runnable only 
Previously, a new thread was created to display the description
of a challenge. Instead of creating a new one, only a single
bukkit runnable is now created. With that change, when the challenge
is skipped, the correct description will show up instantaneously.
 2016-04-25 18:00:37 +03:00
Thanos paravantis
a6bf059e6c Modify challenge names and challenge intro titles 2016-04-25 12:47:55 +03:00
LCastr0
f0cfac8e73 Merge pull request #31 from Mineplex-LLC/develop 
Merge from develop
 2016-04-24 23:15:36 -03:00
Thanos paravantis
c214431cbf Move and rename stat trackers 2016-04-24 22:44:42 +03:00
Thanos paravantis
856eb6059b Update statistics and implement data tracker 2016-04-24 22:39:56 +03:00
Keir Nellyer
96aa5d1c4b Removed duplicate code 
Somehow this got duplicated and so therefore was causing compile time
 errors, might have been something to do with my git merge.
 2016-04-24 17:22:21 +01:00
Thanos paravantis
e2a6500bce Update game achievements 2016-04-24 13:37:39 +03:00
Shaun Bennett
a0fd852537 Move field to top of class in Game 2016-04-24 13:38:58 +10:00
Shaun Bennett
b21dfad12e Merge remote-tracking branch 'remotes/origin/develop' into feature/gems 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2016-04-24 13:37:45 +10:00
Thanos paravantis
bfabfab2d1 Fix circle spawn locations 2016-04-24 00:27:39 +03:00
cnr
c7970d1bd0 Prevent super paintball spectators from reviving teammates. Fixes PC-103 2016-04-22 19:48:03 -05:00
xGamingDudex
b7099088a9 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
 2016-04-23 00:55:48 +02:00
Thanos paravantis
c526c86813 Add notes to fix recent bugs 2016-04-22 23:26:53 +03:00
Thanos paravantis
fa75bc15ad Merge branch 'develop' into thanos-mineware 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2016-04-22 22:03:15 +03:00
AlexTheCoder
2a4c3209b4 - Enable ELO 2016-04-22 05:44:56 -04:00
AlexTheCoder
70541fd6f2 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-22 05:41:24 -04:00
Jonathan Williams
d73b720323 Merge branch 'features/elo' into develop 2016-04-22 04:34:35 -05:00
Jonathan Williams
477acf044e Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-22 04:34:21 -05:00
Jonathan Williams
7b18efa7b0 Prevent farming elo up with multiple games by dc and joining new game. 2016-04-22 04:05:07 -05:00
Jonathan Williams
ddd1c5af9b Removed EloSettings and fixed scoreboard. 2016-04-22 03:10:09 -05:00
Jonathan Williams
34f94c0381 Reverted scoreboard because of MC maxlines turd nugget. 2016-04-22 02:55:27 -05:00
Jonathan Williams
4577cf0398 Fixed scoreboard :D 2016-04-22 02:47:48 -05:00
Jonathan Williams
7cc4811ede Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo 2016-04-22 02:39:35 -05:00
Jonathan Williams
f922be51fe Scoreboard tweak. 2016-04-22 02:39:08 -05:00
AlexTheCoder
04fe30df43 - Fix sb 2016-04-22 03:38:20 -04:00
AlexTheCoder
03bdc8d2db Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 03:17:54 -04:00
Jonathan Williams
b69a75355c Fixed scoreboard alignment. 2016-04-22 02:17:40 -05:00
AlexTheCoder
1d3ad3c5fd - Enabled ELO for testing 2016-04-22 02:06:37 -04:00
Jonathan Williams
44d4255628 Added endElo in the appropriate spots. 2016-04-22 00:58:07 -05:00
Jonathan Williams
6d00e8b41f Refactored Elo to work correctly. 2016-04-22 00:21:11 -05:00
AlexTheCoder
d0e3b094c1 - cleaned up and prepped for live update 2016-04-21 20:57:35 -04:00
AlexTheCoder
e55bec505b - Fix players ending up teleported back to arena due to broken respawn engine 2016-04-21 20:13:39 -04:00