Commit Graph

7716 Commits

Author SHA1 Message Date
xXVevzZXx 95649a5f14 adjust amount of gems as win reward 2016-06-18 20:48:55 -05: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
Keir Nellyer f34c65111b Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-18 00:48:00 +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
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
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
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
Shaun Bennett aa785ed3d5 Code clean-up and documentation 2016-06-12 21:18:11 -05:00
Keir Nellyer 6bc8039dbd Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-11 14:04:43 +01:00
Keir Nellyer ed50e09a6e Fix issue an old un-closed but expired report may be re-opened and cause issues 2016-06-11 13:59:53 +01:00
Keir Nellyer 197acee4ae Implement server weighting 2016-06-11 13:47:45 +01:00
Shaun Bennett cf87469400 Fix a possible NPE, use proper IP and port for api 2016-06-10 20:24:22 -05:00
Shaun Bennett 2421fd1cfe Update booster page, proper booster rewards 2016-06-10 19:40:27 -05:00
Shaun Bennett 42c35063b3 Display all the boosters you have activated 2016-06-10 17:40:59 -05:00
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
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
Keir Nellyer a73e1c24b5 Properly calculate user reputation 2016-06-10 15:47:59 +01:00
Keir Nellyer 380139477c Reduce expiry time for reports 2016-06-10 12:59:50 +01:00
Keir Nellyer 36f47b7067 Clear report cache when report is closed 2016-06-10 12:41:02 +01:00
Keir Nellyer 09009c352b Remove new-line in query 2016-06-10 12:34:23 +01:00
Keir Nellyer 2cacdbae34 Use more robust Guava Cache class for caching 2016-06-10 12:33:46 +01:00
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
Keir Nellyer 4503f12738 Implement report caching 2016-06-10 00:28:07 +01:00
Shaun Bennett 35e1c2af65 Use rewardCoinsLater for giving shards 2016-06-09 18:19:22 -05:00
Keir Nellyer 22dbcbf90d Move util method to sequence CompletableFuture's to new class 'UtilFuture' 2016-06-09 23:41:17 +01: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
Keir Nellyer fe06fba406 Re-word from "hacking" to "guilty" so that button is applicable for both types of reports 2016-06-09 22:49:04 +01:00
Keir Nellyer ad17c620b7 Fix sql query for fetching report result counts 2016-06-09 22:48:18 +01:00
xXVevzZXx f6b60ad956 fix idle manager to persist teleports and make xp rewards depending on playtime 2016-06-09 15:51:27 -05:00
Keir Nellyer e24d67ecd3 Report errors when fetching a ReportProfile and attempt to recover from it 2016-06-09 18:11:38 +01:00
Keir Nellyer f0da319f46 Inventories must be handled on the main thread 2016-06-09 18:00:15 +01:00
Keir Nellyer 1db1257a05 Report message task for handler now checks if the report is still active
Due to recent changes, this no longer needs to run asynchronously as the CompletableFuture class already makes thing asynchronous for us.
2016-06-09 17:45:08 +01:00
Keir Nellyer 5d9a317f2a Fix sql queries which use reserved words 2016-06-09 17:06:44 +01:00
Keir Nellyer e113b0744d Fix incorrect column name when getting report reasons 2016-06-09 17:06:09 +01:00
Keir Nellyer 9dbef26b92 Fix small typo in comment 2016-06-09 16:34:18 +01:00
Keir Nellyer 8e48b00264 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-09 15:16:38 +01: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
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
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
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
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
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
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
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
Keir Nellyer 9465ab40ab Fix sql query for fetching name of user account 2016-06-01 16:51:22 +01: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