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
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
Shaun Bennett
37a412f1bf
Starting to merge boosters into arcade code
2016-06-07 17:24:24 -05: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
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
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
b51007da91
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-02 22:28:35 +01:00
cnr
894b7db18e
Remove remaining fake ultra tag artifacts
2016-06-02 02:25:15 -05: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
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
6cb275e036
PC-121
...
Changed 'a' to 'an' in the text component of the friend menu
2016-05-31 14:44:18 +01: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
cnr
dfbb4dca11
Update chat-spam message with coupon link
2016-05-27 13:18:07 -05:00
samczsun
f1f464f3a4
Change listener priority again. Fixes PC-209
2016-05-26 14:29:13 -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
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
72a2aa926f
Change event priority again. Fixes PC-216
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
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
12c5ba80b7
API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation
2016-05-24 17:13:33 +10: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
