Commit Graph

7716 Commits

Author SHA1 Message Date
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
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
Shaun Bennett e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
Keir Nellyer 01855ba1ce Some small changes to the reporting system after some very shallow
initial testing has been done

Improve exception handling (so we actually get a stacktrace if
something goes wrong).
Check if users can report before showing the category gui.
Tell user if the report failed (due to some sort of internal error).
Correctly get the id of a report when inserting into the database for
 the first time.
Shorten some lambdas by using method references.
Remove some unused imports.
Small variable name changes.
2016-05-29 02:45:24 +01:00
Keir Nellyer 55392eae97 No need for 'this' keyword here 2016-05-29 01:10:42 +01:00
Keir Nellyer 075c2d21e9 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-05-29 00:27:48 +01:00
Keir Nellyer 20038f9e64 Massive changes made to how the report feature functions
Re-enabled report feature (merge from develop disabled it).
Moved reports from Redis to MySQL.
Made everything asynchronous.
Many many other miscellaneous changes.

Bugs will now be worked out and then this should be ready for QA testing
2016-05-29 00:25:26 +01: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
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
Keir Nellyer ad486a7e22 Merge remote-tracking branch 'origin/develop' into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportCategory.java
2016-05-26 13:24:24 +01: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
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
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
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
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
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
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
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
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