Commit Graph

8208 Commits

Author SHA1 Message Date
AlexTheCoder 005189c2d4 Edit kit items in OITQ to fix bow instant charge glitch (Fixes PC-203) 2016-06-30 17:41:09 -05:00
AlexTheCoder b0303a8870 Create new equations for Protection Enchantment functionality to make it work properly (Further fix for PC-311) 2016-06-30 17:41:09 -05:00
AlexTheCoder 37e50df948 Make kits ensure association with players using them (Fixes PC-588) 2016-06-30 17:41:09 -05:00
AlexTheCoder 9c4b787436 Make protection enchantments actually protect wearer from damage (Fixes PC-311) 2016-06-30 17:41:09 -05:00
AlexTheCoder 36bb0b9ae8 Force player visibility to refresh in games over a steady rate (Fixes PC-497) 2016-06-30 17:41:09 -05:00
samczsun 3e1c44bfa3 UHC improvements
Lots of hacky NMS stuff. Ask me if you're confused

Basically, decorate the world async
Keep spawn chunks loaded
Make sure view distance is capped so no chunks are genned on teleport
Add regeneration and resistance on spawn to prevent damage
Set health objective score manually
Teleport player two times to ensure no block glitching
Disable kicking and NCP while teleporting
2016-06-30 17:15:01 -05:00
Sam 40124b2cdd Updated changed method name (getThrower)
In the ProjectileData class GetThrower was changed to getThrower, this
fixes that in any of my classes
2016-06-30 17:19:53 +01:00
Sam 69bd4006d4 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-30 17:14:38 +01:00
samczsun 045e1b3064 Fix various Clans bugs
Viper destroying armor
Legendaries not saving properly
Combat log NPC for vanished players
2016-06-30 05:20:44 -05:00
Thanos Paravantis e25a6e4327 Reset leap data when needed (death/quit/game end) 2016-06-30 05:18:39 -05:00
Thanos Paravantis 5c60819179 Prevent NPE on player interact event 2016-06-30 05:18:39 -05:00
xXVevzZXx 880ac6b88f Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes 2016-06-29 06:21:18 +02:00
LCastr0 671dcaf3aa Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-28 18:14:05 -03:00
LCastr0 24186d9992 More fixes for gadget persistence 2016-06-28 18:11:00 -03:00
Thanos Paravantis 04cb0fb0b0 Use updated ProjectileUser method names 2016-06-28 23:09:52 +03:00
Thanos Paravantis 4436ba0710 Merge branch 'develop' into thanos-mineware 2016-06-28 23:05:11 +03:00
Thanos Paravantis c5c08562c3 Merge branch 'master' into thanos-mineware 2016-06-28 23:01:42 +03:00
Thanos Paravantis 42ebb95db1 Fix NPE on zombie infection 2016-06-28 21:57:32 +03:00
Thanos Paravantis 973666a42f Improve challenge selection system
- Game will no longer end unexpectedly, when all challenges are played.
- Challenges are now marked correctly as played.
2016-06-28 21:57:17 +03:00
Thanos Paravantis 5e9f16424c Add shouldDie method, update zombie wrapper name 2016-06-28 20:38:32 +03:00
Thanos Paravantis 43f375fd86 Reset team data on team challenges 2016-06-28 20:37:26 +03:00
Thanos Paravantis eea980b354 Apply smoother knockback on volley pig 2016-06-28 18:41:50 +03:00
Thanos Paravantis c5367d4510 Remove double plants entire from spawn locations 2016-06-28 12:15:49 +03:00
Thanos Paravantis cf434b92de Modify punch the pig description 2016-06-28 11:47:47 +03:00
Thanos Paravantis dc250d4bf2 Store locations after game start (fix NPE) 2016-06-28 11:47:25 +03:00
Thanos Paravantis 7218dc710f Retrieve scoreboard data only when possible 2016-06-28 11:46:38 +03:00
xXVevzZXx c966620808 Change resourcepack links 2016-06-25 19:52:22 +02:00
xXVevzZXx fbd9b17ba0 fix playeringametime being 0 2016-06-25 12:35:59 -05:00
xXVevzZXx 8d4f5f0f93 Modularize Minestrike and add Strike Games 2016-06-25 19:11:08 +02:00
Thanos Paravantis a714144159 Implement new challenge selection system
The new challenge selection system stores only one instance of each
challenge, instead of creating new ones when the next challenge is
selected. In addition to that, challenge data is now reset every time
the challenge ends to be able to reuse the same resources.

In a future commit, I might as well only generate the spawnpoints once
in an attempt to make things as quick as possible. The new system may have
some bugs, since it's not fully tested with QA yet.
2016-06-25 13:19:09 +03:00
Thanos Paravantis bc229c44aa Apply small changes to Zombie Infection 2016-06-25 11:56:55 +03:00
xXVevzZXx 7a55b131d4 Add SmasgDom, Smash Glags, Tiny Smash, Smash Sheep, Sky Smash, Changing Kits and OP Sheep 2016-06-25 09:11:42 +02:00
LCastr0 30f413d04e Fixes for persistence:
No longer save items after they are disabled
No longer keep the particle effect after a staff vanishes
2016-06-25 02:22:20 -03:00
TadahTech 50759661cf Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-24 23:52:27 -05:00
xXVevzZXx b34d652617 Add Lucky Bridges, CookieFight and OP MB 2016-06-25 06:35:08 +02:00
LCastr0 d75abe3aea Persistence fixes 2016-06-25 00:36:00 -03:00
LCastr0 83f4b25887 Testing persistence fixes 2016-06-25 00:33:36 -03:00
xXVevzZXx 285d94a2ca Fill hotbar editor with glass panes 2016-06-25 04:48:59 +02:00
cnr c430566c6d Never reset a player's YouTube click time locally 2016-06-24 16:59:27 -05:00
Shaun Bennett 94fe9f57d2 Add missing imports 2016-06-24 12:36:56 -07:00
Kenny Goodin dc9145c707 Hotfix, disable youtube and twitter buttons in BonusGUI 2016-06-24 15:33:07 -04:00
TadahTech 0cda8ab7a3 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-24 04:11:59 -05:00
TadahTech 8fbb06ae3d Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-06-24 04:11:38 -05:00
cnr 14542d7dac Close open UIs except for Champions kits 2016-06-24 04:10:08 -05:00
Shaun Bennett 95f7c757cb Fix booster group naming for the quick menu 2016-06-24 04:07:27 -05:00
cnr c40e07695c Only close open UIs when choosing SSM kits 2016-06-24 04:06:28 -05:00
TadahTech e71fc291d1 Fix cross server invites / joining servers. 2016-06-24 04:01:51 -05:00
Shaun Bennett 560abc933c Replace underscores with spaces in booster group 2016-06-24 03:16:42 -05:00
Shaun Bennett b4caf5125b Adjust tip amounts 2016-06-24 03:16:42 -05:00
Shaun Bennett d708c478d7 Dont display other boosters, fix typo 2016-06-24 03:16:42 -05:00
Shaun Bennett 348cb9efba Fix remaining booster message 2016-06-24 02:23:09 -05:00
cnr b58ff8c066 Add YouTube and Twitter buttons to UI 2016-06-24 01:30:10 -05:00
Shaun Bennett def57e2c0b Fix HubManager, add failsafe for BoosterManager 2016-06-23 23:19:02 -07:00
Shaun Bennett fd843b88cb Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
Shaun Bennett 043f9576dd Fix smash mobs booster group 2016-06-23 22:50:31 -07:00
Shaun Bennett a9f291338f Amplifiers GM Candidate 2016-06-23 22:49:12 -07:00
TadahTech c204562eb3 Fix cross server invites / joining servers. 2016-06-23 23:25:26 -05:00
TadahTech eeaf9fa49a Fix chat in arcade 2016-06-23 23:24:50 -05:00
TadahTech ce1aab5e11 Fixes and changes 2016-06-23 21:53:12 -05:00
cnr 3433e0e3bc Merge branch 'project-cosmetics' into develop 2016-06-23 18:42:47 -05:00
xXVevzZXx e09df7ccfd fix chests being opened by specs 2016-06-23 16:46:54 -05:00
xXVevzZXx 399ab5c363 fix supply chest protection, absorbtion effect, tnt and level bugs 2016-06-23 16:46:45 -05:00
Sam f8080d2663 PC-574
Another fix for the minestrike vanish problem, this one fixes staff
being assigned teams on join.
2016-06-23 22:40:15 +01:00
xXVevzZXx dc57f7b4e6 add testrank command for SR.Mods 2016-06-23 22:05:26 +02:00
samczsun a33b070ae7
Deny placing skulls 2016-06-23 15:34:29 -04:00
LCastr0 c1b7be6363 Fix merge problems 2016-06-23 16:33:20 -03:00
LCastr0 7749314e64 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
LCastr0 a441727e09 Freedom update:
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
TadahTech 69c7c9edc8 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-23 03:13:10 -05:00
TadahTech a29b22b8be Undo comments. 2016-06-23 03:12:49 -05:00
TadahTech 33cce620be Update UI and fix typos 2016-06-23 03:11:45 -05:00
TadahTech df53021f7c Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again. 2016-06-23 02:56:42 -05:00
TadahTech fb6a772eb0 Fix Party Redis. Improve Party UI. General testing and fixing. 2016-06-23 02:39:05 -05:00
Shaun Bennett 6e2c751be1 Adjust amplifiers queue message 2016-06-22 21:09:09 -07:00
Shaun Bennett 1ea680cd20 Return to an invisible armor stand name 2016-06-22 21:01:37 -07:00
Shaun Bennett bcf82ad513 Remove debug messages 2016-06-22 21:00:50 -07:00
Shaun Bennett 761e550d6c Add shards to announcement message 2016-06-22 20:55:27 -07:00
Shaun Bennett 0873efd876 Update more lore text 2016-06-22 20:54:29 -07:00
Shaun Bennett 621d72f541 Fix merge issues, update lore text 2016-06-22 20:51:58 -07:00
Shaun Bennett 249a5c70aa Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
Shaun Bennett 906e0e0044 Allow API error messages from HTTP 503 2016-06-22 20:31:18 -07:00
samczsun 956cfeac44
Don't recall if player is dead, show UUID for custom items 2016-06-22 21:14:50 -04:00
samczsun 14c6c4215c
Silent chest opening! 2016-06-22 21:12:24 -04:00
samczsun 032b6a77c0
Display UUID for CMod+ 2016-06-22 21:12:24 -04:00
samczsun 2e1bb25b0b
Fix exceptions 2016-06-22 21:12:24 -04:00
Alex-The-Coder 2453f82061 Rename Filterbutton.java to FilterButton.java 2016-06-22 18:40:12 -04:00
TadahTech 50534c3af9 UI And server manager changes 2016-06-22 17:28:43 -05:00
Thanos Paravantis 4e9ea23db8 Fix spawn facing, separate scoreboard functions 2016-06-22 21:47:39 +03:00
Shaun Bennett e855a866c7 Fix more thanks and booster occurrences 2016-06-22 08:58:27 -07:00
TadahTech e53b474f3f Fix typo. 2016-06-22 00:59:22 -05:00
TadahTech ebff8f865b Undid a little too much. 2016-06-22 00:58:30 -05:00
TadahTech 38a13d01f1 Open server menu properly 2016-06-22 00:56:44 -05:00
TadahTech d9c5e6323a Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-22 00:36:23 -05:00
TadahTech 4d31867e98 PC Party updates. 2016-06-22 00:35:57 -05:00
samczsun d739df8623 UHC is faster now 2016-06-21 22:21:27 -05:00
Sam 0131850fc3 SSM fixes 2016-06-21 20:41:53 +01:00
TadahTech e39326b592 Help Command UI. 2016-06-21 00:11:33 -05:00
TadahTech b75e87753d Party UI work. 2016-06-20 22:45:53 -05:00
TadahTech a49e815765 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-20 16:40:33 -05:00
TadahTech 2211cf4dec Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-20 16:37:07 -05:00
Shaun Bennett 1c1912b92a Update fountain goals again 2016-06-20 00:52:33 -05:00
Shaun Bennett 73183af9bf Fixing podium npc bug 2016-06-20 00:45:57 -05:00
Shaun Bennett afc636b7c5 Fix amplifier reward message 2016-06-19 20:16:33 -05:00
Shaun Bennett bb8d94f38a Fix a lot more Booster cases 2016-06-19 19:48:17 -05:00
Shaun Bennett 63b7648608 Amplifier rename, move podium backwards 2016-06-19 19:05:04 -05:00
Sam a830b5b388 Removal of debug message and compilation error 2016-06-19 17:12:58 +01:00
Sam e8b8a3cd66 PC-504
Fixes an issue where if players in SSM destroyed all of the spawn point
locations, players would not be handled correctly
2016-06-19 17:10:22 +01:00
Shaun Bennett 38058bc670 Confirmation Paging 2016-06-19 05:49:32 -05:00
TadahTech d572635e99 Fix spelling mistake 2016-06-19 02:19:33 -05:00
TadahTech 5316dfe0c6 Remove Spammy "Loaded default kit message".
Fixed SSM kits not closing the GUI when the central item is clicked.
Fixed Smash Crystals being carried over into the next game.
2016-06-19 02:09:17 -05:00
xXVevzZXx 95649a5f14 adjust amount of gems as win reward 2016-06-18 20:48:55 -05:00
Thanos Paravantis cac0169827 Add last player to a random team 2016-06-18 23:51:51 +03:00
Thanos Paravantis 4c31e79e20 Allow team challenges with odd amount of players
May apply more changes or improvements.
2016-06-18 23:18:11 +03:00
Shaun Bennett a8e67eda88 Rename tip message PC-566 2016-06-18 14:45:39 -05:00
Shaun Bennett 2f0a559441 Add reload command, change podium to lime dye, change tip message 2016-06-18 14:41:32 -05:00
Shaun Bennett 690c6160b9 Green Armor 2016-06-18 14:27:53 -05:00
Thanos Paravantis 0b5e409ab8 Make /lose available for all to use on QA testing 2016-06-18 21:02:54 +03:00
Thanos Paravantis fc50c90301 Update chicken attack
- Remove unnecessary clone() method.
- Change chat message when chicken attack is triggered.
- Rename customizeChicken to setupChicken method.
- Use Math.random() instead of UtilMath.random.nextDouble()*100.
- Add hologram that displays "Chicken Minion" above every chicken.
- Increase look at player radius to 4.
- Use generic List instead of ArrayList.
2016-06-18 21:01:46 +03:00
Thanos Paravantis 0368500ad7 Replace QuickChangeBlockAt with resetBlock method 2016-06-18 20:56:59 +03:00
Thanos Paravantis bccce7593f Update second Lava Run to patch obsidian bugs 2016-06-18 20:56:33 +03:00
Sam d167f93486 PC-507
Fixes an issue where Blaze's "Firefly" and "Phoenix" abilities did no
damage or knockback.
2016-06-18 15:33:39 +01:00
Sam c19af4e1c5 PC-505
Fixed an issue where players could hit team members with Bouncy Bacon
and get the health bonus from it.
2016-06-18 00:04:03 +01:00
Sam 09957c203b PC-506
Fixes an issue where the creeper's passive in SSM would activate when
they took starvation damage.
2016-06-17 22:24:46 +01:00
Shaun Bennett 5f9a57b7e2 Lower booster tip cooldown to 1 minute 2016-06-17 16:10:01 -05:00
Shaun Bennett 4e3062f413 Swap Cosmetic and Booster interface slot 2016-06-17 15:23:53 -05:00
Sam 35b00679e0 PC-516
When out of leaps in dragon escape there is no longer the "You can now
use Leap" message.
2016-06-17 18:08:37 +01:00
Sam cbca7e9f7e PC-540
Fixed unneeded messages
2016-06-17 12:06:56 +01:00
Sam 63c2f5c855 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-17 12:06:17 +01:00
TadahTech d16f83af00 Attempt to fix duplicate messages bug. I cannot reproduce in testing. 2016-06-16 21:12:17 -05:00
cnr 16f6d75dea Revert kit name changes
We can change this back whenever we've migrated to the new name in mssql
2016-06-16 20:36:33 -05:00
TadahTech 3dc93e5c8f Fix rare GUI reported bug. 2016-06-16 19:46:31 -05:00
TadahTech 2e0965a064 Fix Infestor kit
Fix rare occurrence of players getting a GUI they shouldn't (reported)
2016-06-16 19:45:36 -05:00
TadahTech e28d411ee4 Fix evolution not progression.
Fixed incorrect description in Gladiators
Reformatted kits in Bridges
2016-06-16 18:39:37 -05:00
Sam a20ae6b58d PC-540
Fixes an issue where players could lose water blocks in Speed builders.
2016-06-17 00:31:32 +01:00
Sam 79085c1ecf PC-541
Fixes an issue where glowing redstone ore would not be counted if the
expected block was redstone ore.
2016-06-17 00:26:24 +01:00
Sam 3f62dd49ef Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-16 23:40:19 +01:00
Shaun Bennett 0873ee0116 Show entire booster queue in booster gui 2016-06-16 16:54:54 -05:00
samczsun 1893e98036
Don't run chat filtering on the main thread 2016-06-16 16:39:43 -04:00
samczsun 01409af5bd
Fix misc bugs
Change UtilServer to return proper plugin instance
Remove /energyshop debug command
Add warning for opening chests while in vanish
Fix item maps being broken
Fix tutorials possibly wiping inventory
Make the project compile
2016-06-16 16:39:43 -04:00
TadahTech 5ac6249684 Fix Bridges Kits not getting their items.
Fix Kits breaking at Level 5
2016-06-16 15:34:23 -05:00
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
samczsun 5c2a9d5807
Prefixes are too long or something 2016-06-15 21:52:25 -04:00
samczsun 2d8b7f4ecd
Cleanse lore 2016-06-15 21:52:25 -04:00
samczsun 18d7eba9db
Let's not eagerly delete clans 2016-06-15 21:52:25 -04:00
samczsun 5564b07a36
Remove unnecessary serializations 2016-06-15 21:52:25 -04:00
samczsun 9933345a7b
Remove debug messages 2016-06-15 21:52:25 -04:00
samczsun 67f4361959
Cleanup CustomItems after a while 2016-06-15 21:52:25 -04:00
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
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