Commit Graph

7961 Commits

Author SHA1 Message Date
Keir Nellyer 128f6af83d Show time of last report and time since 2016-06-27 18:15:41 +01:00
Keir Nellyer 48a2d0d304 Remove old completed todo 2016-06-27 18:06:01 +01:00
Keir Nellyer 42bd2148e5 Don't allow a user to handle more than one report simultaneously 2016-06-27 17:56:01 +01:00
Keir Nellyer dbf0bf35b4 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-26 23:00:19 +01:00
Keir Nellyer 90df695624 Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-26 00:18:07 +01:00
xXVevzZXx fbd9b17ba0 fix playeringametime being 0 2016-06-25 12:35:59 -05: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
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
LCastr0 a18976649b Merge pull request #116 from Mineplex-LLC/develop
Merge develop into project-cosmetics
2016-06-25 00:27:01 -03: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
Keir Nellyer 323d865b57 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-06-24 18:13:51 +01:00
Keir Nellyer c5319dbe1d Switch identifier system for id system (no need for tokens any more) 2016-06-24 18:08:47 +01:00
Keir Nellyer 6028bfb0d0 Make expanded pages work again 2016-06-24 18:06:33 +01:00
Keir Nellyer 52873d5618 Do away with tokens 2016-06-24 17:59:26 +01:00
Keir Nellyer 45418b3a4d Add todo 2016-06-24 17:56:01 +01:00
Keir Nellyer daae2f7a3a Shorten method name 2016-06-24 17:54:54 +01:00
Keir Nellyer 871bb04451 Fix /reporthandle command 2016-06-24 17:45:56 +01:00
Keir Nellyer d178e9112b Temporarily base priority on report age 2016-06-24 15:39:48 +01:00
Keir Nellyer fd64753ba0 New /reporthandle command 2016-06-24 12:14:58 +01: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
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
cnr 3433e0e3bc Merge branch 'project-cosmetics' into develop 2016-06-23 18:42:47 -05:00
Keir Nellyer d67082bca2 Ran a code inspection and implemented some suggested changes 2016-06-23 23:31:51 +01: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
Keir Nellyer 7e33558e2d Updates to the report system website, semi-works 2016-06-23 20:41:46 +01:00
Keir Nellyer 7f75a7ff50 Unfortunately we can't batch these SQL commands as we have to retrieve the snapshot id after inserting 2016-06-23 20:36:34 +01: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
Keir Nellyer e6989cd8da Output errors caused by inserting snapshots into database 2016-06-23 20:06:16 +01:00
Keir Nellyer 7b184eab03 Fix various MySQL errors, further transition to fetching from db 2016-06-23 15:18:00 +01:00
Keir Nellyer dbf0a79b95 Update deprecated constructors to new-style constructors 2016-06-23 14:48:57 +01:00
Keir Nellyer 4606f27408 Switch report ids to use data type 'long'
This is because in the database we store them as an unsigned integer, which means the Java integer type will not be able to hold values after a certain point.
2016-06-23 14:11:58 +01: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