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
Shaun Bennett
bcf82ad513
Remove debug messages
2016-06-22 21:00:50 -07:00
Shaun Bennett
761e550d6c
Add shards to announcement message
2016-06-22 20:55:27 -07:00
Shaun Bennett
0873efd876
Update more lore text
2016-06-22 20:54:29 -07:00
Shaun Bennett
621d72f541
Fix merge issues, update lore text
2016-06-22 20:51:58 -07:00
Shaun Bennett
249a5c70aa
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
Shaun Bennett
906e0e0044
Allow API error messages from HTTP 503
2016-06-22 20:31:18 -07: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
addbd4dd88
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-23 01:21:12 +01:00
Keir Nellyer
a795ee3d0f
Fix feature initialisation code
2016-06-23 01:18:16 +01:00
Keir Nellyer
4fc5e036fa
Remove old redundant chat cache command
...
Fix broken code in SnapshotPlugin
2016-06-23 01:13:18 +01:00
Keir Nellyer
8bbeb3292f
Removed old code resulting in compiler error and replaced with a todo for the future
2016-06-23 01:03:25 +01:00
Keir Nellyer
2931826916
Improve readability by separating these functions out
2016-06-23 01:01:20 +01:00
Keir Nellyer
352ecc6ad6
Improve database performance by executing queries in batch
2016-06-23 00:57:41 +01:00
Keir Nellyer
09a74e3772
Work on pushing chat snapshots to db
2016-06-23 00:38:24 +01:00
Shaun Bennett
e855a866c7
Fix more thanks and booster occurrences
2016-06-22 08:58:27 -07:00
samczsun
d739df8623
UHC is faster now
2016-06-21 22:21:27 -05:00
Keir Nellyer
ef0c3721d8
Micro-optimisation since this ArrayList will only ever hold a maximum of 2 items
2016-06-21 17:47:44 +01:00
Keir Nellyer
b46f08938e
Implement age decay algorithm as supplied by @alexthecoder
2016-06-21 17:46:52 +01:00
Shaun Bennett
1c1912b92a
Update fountain goals again
2016-06-20 00:52:33 -05:00
Shaun Bennett
73183af9bf
Fixing podium npc bug
2016-06-20 00:45:57 -05:00
Shaun Bennett
afc636b7c5
Fix amplifier reward message
2016-06-19 20:16:33 -05:00
Shaun Bennett
bb8d94f38a
Fix a lot more Booster cases
2016-06-19 19:48:17 -05:00
Shaun Bennett
63b7648608
Amplifier rename, move podium backwards
2016-06-19 19:05:04 -05:00
Keir Nellyer
b4f10531cb
Merge branch 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-19 22:46:19 +01:00
Keir Nellyer
2cfb84eece
Shorten some code
2016-06-19 22:46:06 +01:00
Keir Nellyer
ec2ec878e8
Message type id mapping in preparation for storing chat messages in database
2016-06-19 22:28:56 +01:00
Keir Nellyer
71a4b601e5
Some work on getting the chatsnap site to read from the database
2016-06-19 22:21:12 +01:00
Shaun Bennett
38058bc670
Confirmation Paging
2016-06-19 05:49:32 -05:00
TadahTech
d572635e99
Fix spelling mistake
2016-06-19 02:19:33 -05:00