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
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
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
samczsun
a33b070ae7
Deny placing skulls
2016-06-23 15:34:29 -04: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
samczsun
956cfeac44
Don't recall if player is dead, show UUID for custom items
2016-06-22 21:14:50 -04:00
samczsun
14c6c4215c
Silent chest opening!
2016-06-22 21:12:24 -04:00
samczsun
032b6a77c0
Display UUID for CMod+
2016-06-22 21:12:24 -04:00
samczsun
2e1bb25b0b
Fix exceptions
2016-06-22 21:12:24 -04:00
Keir Nellyer
a795ee3d0f
Fix feature initialisation code
2016-06-23 01:18:16 +01:00
Keir Nellyer
09a74e3772
Work on pushing chat snapshots to db
2016-06-23 00:38:24 +01: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
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
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
Keir Nellyer
197acee4ae
Implement server weighting
2016-06-11 13:47:45 +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
Shaun Bennett
d4ac309daa
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
2016-06-09 00:29:27 -05: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
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
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
samczsun
f7adf731a9
Delete query command
2016-06-01 16:17:17 -04:00
cnr
25a315ac05
Revert "Clans optimizations"
...
This reverts commit 89da8790bf
2016-06-01 00:58:58 -05:00
Shaun Bennett
e380354bad
Refactor CurrencyType
2016-05-29 16:34:21 -05: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
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
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
