Commit Graph

7847 Commits

Author SHA1 Message Date
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
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