JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,566 Commits 1 Branch 0 Tags 481 MiB
26d8fe5e6e
Commit Graph

9268 Commits

Author SHA1 Message Date
AlexTheCoder
223fb0e526 Use custom explosion calculations as opposed to default mineplex explosion handling 2016-08-05 14:30:00 -04:00
AlexTheCoder
d73ced0e87 Stop portals from spawning in mid-air 2016-08-05 14:28:49 -04:00
AlexTheCoder
6170f9df87 Actually enable create button by removing stray '!' 2016-08-05 14:27:07 -04:00
AlexTheCoder
027b6b3fc4 Prevent players from using /c home after recently being in combat 2016-08-05 14:25:47 -04:00
AlexTheCoder
ce6a0b376c Prevent players using the gui to bypass join cooldowns 2016-08-05 14:24:56 -04:00
AlexTheCoder
e01b57ceac Implement auto restart system for clans servers in off-peak times 2016-08-05 14:24:00 -04:00
AlexTheCoder
ee1f2a7ef9 Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611) 2016-08-05 14:22:17 -04:00
AlexTheCoder
1ab5c8229b Make bosses clean up after themselves and be more error-resistant 2016-08-05 13:40:05 -04:00
AlexTheCoder
14f140143b Re-enable music in hub gadgets 2016-08-05 13:34:33 -04:00
AlexTheCoder
bf7065732b Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have 2016-08-05 13:34:04 -04:00
Keir Nellyer
1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-08-05 17:05:01 +01:00
Sam
2c6fc85fee Logic fix and message change 2016-08-04 17:59:28 +01:00
cnr
0ca4fe2d38 Disable MAC kick for suspicious movement 2016-08-04 12:41:59 -04:00
Sam
618a132806 Payload path marker logic change 2016-08-04 17:29:40 +01:00
Sam
24c1e5fc3b Kit items are now unbreakable 2016-08-04 17:29:01 +01:00
Sam
23b7064d43 Island ores bug 2016-08-04 16:56:13 +01:00
Sam
190ced7d97 Metal Kit tweaks 2016-08-04 16:55:52 +01:00
xXVevzZXx
91cf391724 some adjustments to UHC Survivalgames 2016-08-04 00:33:24 -04:00
cnr
3610f78b37 Merge branch 'feature/thanks' into develop 2016-08-03 22:23:46 -04:00
Shaun Bennett
85c4c181ec Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl 2016-08-03 18:22:36 -05:00
Shaun Bennett
e113bedea5 Fix accidentally refactoring "thanks" in strings 2016-08-03 15:11:31 -05:00
Shaun Bennett
72f078fe54 Fix using wrong name, add missing jooq files 2016-08-03 15:04:06 -05:00
Shaun Bennett
6d93efc1a2 Adjust button text as well 2016-08-03 14:57:30 -05:00
Shaun Bennett
ad6c1dd970 Adjust some text wording 2016-08-03 14:55:33 -05:00
Shaun Bennett
2e80838376 Update ClaimTips lore 2016-08-03 14:25:07 -05:00
Shaun Bennett
a61906acfa Ignore "Testing" boostergroup when announcing activation 2016-08-03 14:24:49 -05:00
Shaun Bennett
ca13b8f29e Fix compile errors 2016-08-03 14:18:26 -05:00
Shaun Bennett
1ae7f6cb25 Integrate the new ThankManager into Amplifiers 2016-08-03 14:03:12 -05:00
cnr
3f0938815d Merge branch 'update/clans' into develop 2016-08-03 12:39:52 -04:00
AlexTheCoder
fb3cfecc79 Move recharge handler 2016-08-02 20:44:09 -04:00
Sam
2b8754aa32 Metal Kit bug fixes 2016-08-02 23:34:12 +01:00
Keir Nellyer
c327309a65 Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future 2016-08-02 16:46:14 +01:00
Shaun Bennett
f41cd8c104 Add /thank command. Update jooq files 2016-08-02 00:10:46 -05:00
md_5
dad453bd84 Remove Sentry - Unused 2016-08-02 11:42:16 +10:00
Sam
62a1968b01 Experimental Metal Kit 2016-08-02 01:13:16 +01:00
AlexTheCoder
4fdbb1fc9d Fix assorted bugs 2016-08-01 14:48:44 -04:00
Sam
bd00ac8446 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-01 19:34:40 +01:00
Sam
2c37af32ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-01 19:19:34 +01:00
Sam
4085453f0f Ninja Dash stopping/not working on rails 2016-08-01 18:47:17 +01:00
Sam
71f9fd97d6 End Effect change 
Reduced the amount of TNT thrown and reduced the velocity at which they
are fired.
 2016-08-01 18:46:35 +01:00
Sam
8f96b15454 Ninja Dash damage radius fix 2016-08-01 17:18:01 +01:00
Sam
84a4aa5157 Reduce Shuriken damage 2016-07-31 13:47:28 +01:00
Sam
1fde433c50 More changes and fixes 2016-07-30 22:53:36 +01:00
AlexTheCoder
cd237b8d3b Make players teleport to shops once they return to the nether 2016-07-30 17:42:57 -04:00
AlexTheCoder
d12d353c20 Fix pronoun in message autoreply 2016-07-30 17:36:03 -04:00
AlexTheCoder
2d39dbfb58 Move clans admin text 2016-07-30 17:34:03 -04:00
AlexTheCoder
fe92633802 Add claim limit override for admin claiming 2016-07-30 16:49:39 -04:00
AlexTheCoder
d1d366dcf8 Add a cooldown to clans shops to reduce chance of edge-case negative gold balances 2016-07-30 09:46:02 -04:00
AlexTheCoder
9e2ba8c653 Fix fissure applying to anvils 2016-07-30 09:36:38 -04:00
Sam
063e05c0f3 Move subtle changes and fixes 2016-07-29 19:07:24 +01:00
AlexTheCoder
ecb56bf450 Fix players being able to use de-blink to teleport between worlds 2016-07-29 13:35:09 -04:00
Keir Nellyer
635e07c5a2 This wasn't meant to be included in the last commit 2016-07-29 15:09:21 +01:00
Keir Nellyer
bb9dbf1da4 PC-877 Vanish report handler when teleporting to offender's server 2016-07-29 15:08:03 +01:00
Keir Nellyer
806ec2460a Add Gameplay report category for gameplay related reports 2016-07-29 13:20:06 +01:00
Keir Nellyer
43c94e95b3 PC-875 Players should only be banned after 3 abusive reports (currently is set to 1) 2016-07-29 12:58:08 +01:00
Keir Nellyer
9c76fec54e PC-874 Show label for report closure reason when closing a report 2016-07-29 12:56:14 +01:00
AlexTheCoder
96e0625548 Fix mislabeling of shop item in user display 2016-07-29 03:15:22 -04:00
cnr
d853f8467c Merge branch 'update/clans' into develop 2016-07-28 22:56:23 -05:00
TadahTech
9529789159 Remove 3 second chat delay. 2016-07-28 22:54:04 -05:00
AlexTheCoder
62e0a39ee8 Fix some medium graphics issues 2016-07-28 23:28:47 -04:00
cnr
8d0dc0ce08 Merge branch 'feature/party-v2' into develop 2016-07-28 21:19:52 -05:00
AlexTheCoder
f53503f16a Move code in sync runnable 2016-07-28 21:07:29 -04:00
AlexTheCoder
dddfb4420c Fix players being allowed to recall through worlds 2016-07-28 21:05:25 -04:00
AlexTheCoder
841a44b8a6 Make clan create button functional 2016-07-28 21:02:04 -04:00
AlexTheCoder
16804a860c Made duping usage for class shop impossible 2016-07-28 20:22:30 -04:00
AlexTheCoder
97d5d21a55 Fix lightning orb duping 2016-07-28 19:43:43 -04:00
AlexTheCoder
853fe31fbe Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-28 19:11:39 -04:00
AlexTheCoder
3aad06cc8a Make Clans displayed as FULL instead of BETA in server compass 2016-07-28 19:11:14 -04:00
AlexTheCoder
47d79bbad5 Fix bugs arising during clans release 2016-07-28 19:08:47 -04:00
AlexTheCoder
f3944527f8 Display clans purchases properly in support server 2016-07-28 19:08:24 -04:00
LCastr0
ab8d6daa2c GitHub being annoying again 2016-07-28 19:59:49 -03:00
Sam
9b71f8c30b Typo in KitBarrage 2016-07-28 22:49:58 +01:00
Sam
6c11037460 First QA testing session feedback 2016-07-28 22:39:05 +01:00
LCastr0
ab52965e44 Power Play button inside Carl, and the power play manager 2016-07-28 18:07:10 -03:00
Sam
771f643b42 Jumping disabled during Pyromancer ULT 2016-07-28 21:01:29 +01:00
cnr
a498bc13db Reinstate async wrappers for clans gold access 2016-07-28 14:59:43 -05:00
Sam
446aec5187 Add "for Team X" when picking up the Arrow powerup 2016-07-28 20:19:50 +01:00
Sam
ba03051689 Add 1 second respawn delay 2016-07-28 19:33:16 +01:00
Sam
d30703c570 Completed game logic & Kit fixes 2016-07-28 19:31:15 +01:00
Shaun Bennett
9c42f4c147 Use the proper boostergroup for amplifier thanks 2016-07-28 13:27:48 -05:00
Keir Nellyer
5dd35d45c4 PC-873 Alert user regardless of usage if banned from using /report 2016-07-28 17:41:20 +01:00
Keir Nellyer
8ee6ab6a1b Display message to reporters of a report when it is closed 2016-07-28 17:17:12 +01:00
AlexTheCoder
f0be7794f5 Lower skeleton king passive rate 2016-07-28 06:16:20 -04:00
AlexTheCoder
4efe1fe76d Make boss portals open where the boss spawned 2016-07-28 05:46:26 -04:00
AlexTheCoder
c30d30b2e7 Fixes event mobs getting stuck outside 2016-07-28 05:33:37 -04:00
TadahTech
ab9bf2f405 Fixes possible bug with party leaders not seeing chat. 
Adds pling when you received an invite.
 2016-07-28 03:40:24 -05:00
AlexTheCoder
639e089901 Disable clans tutorial 2016-07-28 04:28:34 -04:00
AlexTheCoder
aef94e13a8 Fix message not being sent 2016-07-28 04:18:29 -04:00
AlexTheCoder
b718a72366 Fix shop chunk size being too small for map 2016-07-28 02:59:03 -04:00
cnr
dd38a1dd76 Merge branch 'update/clans' into develop 2016-07-27 20:40:35 -05:00
AlexTheCoder
d5a1312c48 Update border size to match new map 2016-07-27 20:46:40 -04:00
cnr
05e59ae9cc Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"" 
This reverts commit 917b83250d.
 2016-07-27 19:03:04 -05:00
Sam
00c0e38b82 Kit upgrades now display 2016-07-27 23:02:40 +01:00
xXVevzZXx
749fa36a5a remove debug and check for Integer class 2016-07-27 16:47:08 -05:00
cnr
646ce96250 Ensure gold balance row is present 2016-07-27 16:15:03 -05:00
AlexTheCoder
62871686b0 Update clans store items to currency changes 2016-07-27 16:57:07 -04:00
cnr
dfbebe11f4 Use separate gold balances for each clans server 2016-07-27 15:52:07 -05:00
AlexTheCoder
031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
AlexTheCoder
6180bea5cc Update clans drop aesthetics and spawn/shop locations 2016-07-27 15:07:11 -04:00
xXVevzZXx
43c45f4094 add timer to dragon escape 2016-07-27 13:59:35 -05:00
Sam
8648581140 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-27 19:57:25 +01:00
Sam
ee38cb4c39 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-27 19:56:36 +01:00
Sam
888d3fb1aa Payload logic progress 2016-07-27 19:56:31 +01:00
cnr
167c0f2b5e Reimplement EnergyShopButton with new machinery 2016-07-27 13:52:03 -05:00
cnr
3cddf35d12 Refactor out legacy ConfirmationPage 2016-07-27 13:52:03 -05:00
cnr
3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
cnr
dc96258055 Merge branch 'feature/party-v2' into develop 2016-07-27 13:19:25 -05:00
Shaun Bennett
0d46bc4609 Add Amplifier thank button 2016-07-27 13:17:36 -05:00
Keir Nellyer
4dbbe6c32a Allow Collector instance to be configured in parameters 2016-07-27 16:49:50 +01:00
Keir Nellyer
97d72e97e4 Variable refactorings for consistency 2016-07-27 16:09:38 +01:00
Keir Nellyer
f2435c3b43 Packet class refactorings 2016-07-27 16:08:23 +01:00
Keir Nellyer
20fc867578 Display rank 'ALL' as 'Player' 2016-07-27 15:52:22 +01:00
Keir Nellyer
d474139220 Don't show Punish GUI unless report result is ACCEPTED 2016-07-27 15:46:54 +01:00
Keir Nellyer
63917297ef Show /report and /reportclose command usage when attempting to use the command incorrectly 2016-07-27 15:45:12 +01:00
xGamingDudex
72b5507390 Fixed PC-120 2016-07-27 12:29:07 +02:00
xGamingDudex
161381f393 Fixed PC-698 2016-07-27 12:09:59 +02:00
AlexTheCoder
157c969e8d Completely prevent players in parties from joining Clans servers 2016-07-27 05:51:49 -04:00
AlexTheCoder
d162750aec Keep nether loaded if its not empty 2016-07-27 04:47:03 -04:00
AlexTheCoder
ea3cb36d3a Clean up miniboss mobs after their chunk unloads 2016-07-27 04:43:00 -04:00
AlexTheCoder
85cf005eba Small clans economy changes 2016-07-26 22:33:19 -04:00
AlexTheCoder
9c700425fd More javadocs 2016-07-26 22:32:46 -04:00
Keir Nellyer
2a167745a6 Update chatsnap url 2016-07-26 16:51:59 +01:00
AlexTheCoder
d98ca0ab3c Remove unused miniboss 2016-07-26 09:00:37 -04:00
AlexTheCoder
bb5d766ba6 Patch war point evasion by committing suicide in safezones 2016-07-26 07:35:11 -04:00
AlexTheCoder
34d5fb5e24 Fix craters getting glitched in wilderness 2016-07-26 07:15:40 -04:00
AlexTheCoder
e396acc69c Fix clans ips being added to the bungee rotator 2016-07-26 07:15:09 -04:00
AlexTheCoder
4df8de58a6 More javadocs 2016-07-26 05:51:42 -04:00
AlexTheCoder
bf5e9f1d76 ADD JAVADOCS TO CLANS 2016-07-26 05:50:43 -04:00
AlexTheCoder
61eca3ced0 Removed auto disguising from clans hub and removed clans tnt protection 2016-07-26 00:54:31 -04:00
AlexTheCoder
7b358adba1 Prevent runed pickaxe from destroying the nether 2016-07-25 20:26:23 -04:00
AlexTheCoder
b41ad2e087 Fix NPC orientation in clans hub 2016-07-25 12:28:25 -04:00
AlexTheCoder
aecaa89443 Update clans hub spawn location 2016-07-25 12:08:37 -04:00
AlexTheCoder
9a73784b7c Make clans in the hub route through clans hubs 2016-07-25 11:18:10 -04:00
AlexTheCoder
a1fd021f8d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-25 10:59:38 -04:00
AlexTheCoder
6f0d21120e Serious tweaks to gameplay and begin documentation 2016-07-25 10:59:03 -04:00
AlexTheCoder
0ecdce4edc Add clans hub to maven 2016-07-25 10:58:32 -04:00
AlexTheCoder
979bb92034 Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration 2016-07-25 10:57:15 -04:00
AlexTheCoder
25b0ae5916 Add support for sending players back to any clans hub via portal 2016-07-25 10:56:30 -04:00
AlexTheCoder
275ab52f79 Create a clans-only hub 2016-07-25 10:55:18 -04:00
AlexTheCoder
9fab8366b7 Add support for clans hub connection inside bungees 2016-07-25 10:52:48 -04:00
TadahTech
5180e46be7 Revert party chat symbol to "@". Change team chat symbol to "#". 2016-07-24 22:17:50 -05:00
Sam
80eb7b2fd3 Gives Super Arrow on start. 2016-07-24 22:44:50 +01:00
Sam
576b92a5ce Ultimates added to QuiverPayload 2016-07-24 22:06:14 +01:00
TadahTech
a23c2c4e1c Update UI to reflect allowing upgrades to be shown, per kit. 2016-07-24 16:05:19 -05:00
Sam
ef797aa599 Velocity fix 2016-07-24 21:41:42 +01:00
Sam
76da92f42e QuiverPayload added 
Basic implementation added
 2016-07-24 21:27:31 +01:00
LCastr0
f4c40c61bb Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-24 13:18:53 -03:00
LCastr0
195a82f78f Github is annoying me about this, but I don't know what it is 2016-07-24 13:18:33 -03:00
LCastr0
0dce530438 PowerPlayClub managers and stuff 2016-07-24 13:15:32 -03:00
Sam
a8503d2fb8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-24 11:50:48 +01:00
Sam
4728a50ca9 Small message change 
Avoids using two variables
 2016-07-24 11:49:57 +01:00
TadahTech
ceccf2d2ac Don't give the item when a game is in progress. 2016-07-23 22:36:53 -05:00
TadahTech
133376fb94 Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full. 2016-07-23 19:50:57 -05:00
Sam
50de769e36 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-24 00:13:13 +01:00
Sam
03b3c1864d Map crumble issue 
Fixes an issue where the max distance of a map would not be calculated
correctly affecting the map crumble
 2016-07-24 00:12:48 +01:00
Sam
d3c9957f95 Ultimate length tweaks 2016-07-23 23:43:06 +01:00
Sam
43aae5e076 Ultimate visual and gameplay improvements 2016-07-22 22:47:29 +01:00
AlexTheCoder
818ed4c9a9 Set up clans monetization features in the shop and fix some hardcoded names in core 2016-07-22 00:18:34 -04:00
AlexTheCoder
869dfc1dfa Finalize Amplifier system 2016-07-21 20:21:11 -04:00
TadahTech
5d0b5f80c0 Fix Party server sending. Tweak playercount and GUI display 2016-07-21 18:01:43 -05:00
Keir Nellyer
369246f635 Fix out of bounds statement parameter caused by earlier removal of report preferences 2016-07-21 23:11:48 +01:00
Keir Nellyer
c5f3f2b2d6 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-21 22:44:43 +01:00
AlexTheCoder
891a3231d8 Change banner GUI 2016-07-21 17:37:02 -04:00
AlexTheCoder
b87c6cfff0 Fix git removing class 2016-07-21 17:27:41 -04:00
AlexTheCoder
75cc75f40c Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-21 17:25:15 -04:00
AlexTheCoder
55c63364f2 Fix KOTH starting in other hub worlds and hub basketball teams always being null 2016-07-21 16:57:24 -04:00
TadahTech
2b8930eee8 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-21 15:32:49 -05:00
TadahTech
d7c5184980 Party fixes and tweaks. 2016-07-21 15:24:48 -05:00
AlexTheCoder
286a7aa32a Even more debug 2016-07-21 16:16:38 -04:00
AlexTheCoder
4a77a587f8 Fix git removing a class 2016-07-21 16:11:05 -04:00
AlexTheCoder
b5ce35544f Fix merge conflict 2016-07-21 15:48:56 -04:00
AlexTheCoder
fc3ceddf4d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-07-21 15:47:59 -04:00
AlexTheCoder
97ef408e14 Debug 2016-07-21 15:46:48 -04:00
Shaun Bennett
9ed0bbe43a Fix NPC's for unloaded worlds 2016-07-21 14:22:38 -05:00
xXVevzZXx
0262452b6a Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable. 2016-07-21 13:59:35 -05:00
AlexTheCoder
11992129d1 Convert to EntityPortalEnterEvent 2016-07-21 14:01:08 -04:00
AlexTheCoder
d59882007b Slightly increase boundaries 2016-07-21 13:55:09 -04:00
AlexTheCoder
37cf863625 Tiny fixes 2016-07-21 13:46:13 -04:00
AlexTheCoder
57f9f7db4b Fix ClassCastException 2016-07-21 13:25:17 -04:00
AlexTheCoder
1f2b1557d5 Work on amplifiers and deleting banners when the clan is deleted 2016-07-21 13:20:45 -04:00
Keir Nellyer
9b58c53e90 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-21 16:11:09 +01:00
Sam
faece2c5f8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-21 11:13:15 +01:00
Sam
f48009d9f8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-21 11:12:23 +01:00
Sam
e7658b4bf2 New kits and upgrades for old kits 2016-07-21 11:05:21 +01:00
AlexTheCoder
e5cd38c11b Revert enjin changes 2016-07-21 05:20:47 -04:00
AlexTheCoder
2615ef74dd Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-21 05:09:54 -04:00
AlexTheCoder
1dedde41a8 Banners and beginning javadocs 2016-07-21 05:09:31 -04:00
TadahTech
b48f97fd2e Fix stupid JOOQ issue and IntelliJ. 2016-07-21 03:46:18 -05:00
TadahTech
b734dc4e87 Remove Pay wall for Party sizes 2016-07-21 02:59:15 -05:00
TadahTech
9f0f4e0018 Fix possible cross server invite spamming. 2016-07-21 02:20:02 -05:00
TadahTech
f1b3c4756d Use UUID's instead of playernames. 2016-07-21 02:16:26 -05:00
TadahTech
4cab91f251 Use getPlayerExact. 2016-07-21 02:05:37 -05:00
TadahTech
76ac89266e -sigh- a hotfix. 
Won't invite players across servers who are already in parties.
Fix transferring ownership to non-party members
 2016-07-21 02:05:10 -05:00
cnr
e7da161f35 Revert "Fixed PC-706" 
This reverts commit 96d16be5b7.
 2016-07-20 20:07:06 -05:00
cnr
b0f5b536b1 Merge branch 'feature/party-v2' into develop 2016-07-20 18:06:14 -05:00
Shaun Bennett
31d6a2542d Replace runSync call with runAsync 2016-07-20 18:03:01 -05:00
Shaun Bennett
b136372d1b Gem fountain changes; increase goal, link to eu 2016-07-20 18:03:01 -05:00
TadahTech
c3b7a81730 Don't show all buttons in all menus. Protected fields != private fields. 2016-07-20 17:48:24 -05:00
cnr
9a06cce0a0 Merge branch 'feature/party-v2' into develop 2016-07-20 16:41:50 -05:00
TadahTech
0fc64c45a8 Update JoinResponseReason 2016-07-20 16:33:26 -05:00
TadahTech
96261c1a6d Party PR Updates. 2016-07-20 16:18:49 -05:00
TadahTech
67a185acc9 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-20 15:52:59 -05:00
AlexTheCoder
ff210271c9 Add javadocs 2016-07-20 12:21:15 -04:00
AlexTheCoder
0b4c9d78ff Finalize game integration into map 2016-07-20 11:22:14 -04:00
AlexTheCoder
29d52ac075 More work on Nether 2016-07-20 10:42:24 -04:00
Keir Nellyer
1ca7519963 Make index preservation faster 2016-07-20 13:19:21 +01:00
Keir Nellyer
85c1bc1728 Ensure returned list really is in the original order 2016-07-20 13:08:33 +01:00
TadahTech
136eb078ef PC-426: Update UX for non-premium players: 
Removes the in game advertisement display when selecting servers.
Removes all chat throttling.
Adds a message sent on join to the player, promoting the newest sale or promotion.
 2016-07-20 06:59:37 -05:00
Keir Nellyer
a78c71793a Made filter method return results in the same order they were entered and generally improved method code 2016-07-20 12:46:10 +01:00
Keir Nellyer
48f9085c79 Small changes to report close functionality 2016-07-20 11:58:09 +01:00
Keir Nellyer
856f91da24 Update close report command syntax 2016-07-20 10:40:42 +01:00
Keir Nellyer
5c3f78b428 Fix query used to fetch report(s) account is handling 2016-07-20 10:40:03 +01:00
Sam
d53a917627 getAbilityDetails using map and list interface 
Changes so it uses the interface rather than the concrete class.
 2016-07-19 22:38:32 +01:00
Sam
7e26480452 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-19 22:29:00 +01:00
Sam
3411a3b978 Throwable Dirt colliding issues 
Fixes the falling dirt block colliding with the thrower.
 2016-07-19 22:28:56 +01:00
Sam
8b552a69de Removal of debug message 2016-07-19 21:45:03 +01:00
Sam
765958a421 Code cleanup for PerkDirtCannon 
Cleans up some bad code in PerkDirtCannon and now removes the dirt
blocks on death.
 2016-07-19 20:51:14 +01:00
Sam
7470078da9 Typo in PerkFireBurst 
Should say Blaze Rod instead of Snowblock
 2016-07-19 20:50:19 +01:00
Sam
588e32e1b1 Addition knockback perk for Earth Kit 
Adds a perk so that the Earth kit takes 75% less knockback while on the
ground
 2016-07-19 20:49:27 +01:00
Sam
0390822fd7 IceBridge item no longer droppable 2016-07-19 20:48:36 +01:00
Sam
63a0eebd02 Increased chance enchanted of armour 2016-07-19 20:48:12 +01:00
Keir Nellyer
80f0113183 Fix commands out of sync error by storing the result of the query 2016-07-19 17:56:27 +01:00
AlexTheCoder
0eac157701 Implement basketball features in the hub and begin setting up coordinates 2016-07-19 12:45:38 -04:00
Keir Nellyer
fccc1834a5 Rewrite view.php to work without MySQL native driver 2016-07-19 17:31:46 +01:00
Keir Nellyer
1c1825710d Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2 2016-07-19 16:38:19 +01:00
Keir Nellyer
37a06816dd Modify /reportclose to no longer require a report id parameter 2016-07-19 16:37:53 +01:00
TadahTech
c32e647d9e Add private messaging system 2016-07-18 22:21:09 -05:00
TadahTech
ce4289fa00 Don't do weather. 2016-07-18 22:13:32 -05:00
TadahTech
c8075b2b47 Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2 2016-07-18 19:04:26 -05:00
TadahTech
b4aa303923 Bug fixes. 2016-07-18 19:04:02 -05:00
TadahTech
36f2873e15 Map Parser update. 2016-07-18 19:00:11 -05:00
AlexTheCoder
5ecfaef413 Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-07-18 16:28:22 -04:00
AlexTheCoder
c58d226680 More work on Nether and Runes 2016-07-18 16:26:05 -04:00
Keir Nellyer
d9240e1589 Invalid PHPDoc made me write bad code :P 2016-07-18 19:29:05 +01:00
Keir Nellyer
ca835bb4c6 Remove all try...finally clauses as they aren't supported in PHP 5.4 2016-07-18 19:08:37 +01:00
Keir Nellyer
976e8788b7 Update report message if a player reports another player multiple times 2016-07-18 18:37:21 +01:00
Keir Nellyer
103f31afc1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-18 17:17:11 +01:00
Keir Nellyer
17c7f36b04 Fix getInvolvedUsers not getting reporters 2016-07-18 14:37:23 +01:00
Keir Nellyer
c89b35f2f1 Remove redundant categories array 2016-07-18 14:36:21 +01:00
AlexTheCoder
4238a1c385 Implement rune system and main nether minibosses 2016-07-17 07:14:08 -04:00
xXVevzZXx
370b0693d9 fix the server thinking it's the next week 2016-07-17 05:20:21 -05:00
cnr
0ae4b0c5e0 Temporarily disable anti-xray in UHC 2016-07-16 23:08:18 -05:00
AlexTheCoder
98e88d1b77 Disable bosses not scheduled for initial releases 2016-07-16 22:00:38 -04:00
AlexTheCoder
08850d909f Further work on brood mother boss and nether 2016-07-16 21:59:03 -04:00
LCastr0
7c300acaa3 No particles for vanished players! 2016-07-16 20:00:21 -03:00
Sam
e2af4df44b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-16 21:22:57 +01:00
Shaun Bennett
34f718b2ec Fix improper gem/shard reward handling 2016-07-16 06:27:16 -05:00
Sam
30111eb940 Duplicate enchantment fix 2016-07-16 11:16:57 +01:00
Sam
951e07488a GI changes from testing session 2016-07-16 11:15:33 +01:00
Sam
f012e8d4ed Merge from develop 2016-07-16 08:41:15 +01:00
Sam
8523d56bbf Merge fix 2016-07-16 08:33:41 +01:00
Keir Nellyer
6756d04aa7 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-15 23:56:08 +01:00
Keir Nellyer
3a8722a1a2 Remove redundant files and variables 2016-07-15 23:54:20 +01:00
Sam
d901fce3ac Experimental Skywars Kits 2016-07-15 23:07:17 +01:00
Keir Nellyer
0d9aad37f9 Optimise imports 2016-07-15 16:31:25 +01:00
xXVevzZXx
728a91da0f adding damage outsid ethe loop 2016-07-15 04:57:44 +02:00
xXVevzZXx
3070835662 enable armor protection and fix shotguns 2016-07-15 04:39:53 +02:00
xXVevzZXx
6c7f2d8b0d fix damage in DM prepare, eating grenades and no health regen 2016-07-15 02:28:22 +02:00
Keir Nellyer
f0c2686ca7 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-14 23:01:11 +01:00
Keir Nellyer
16f451efba Add MySQL upgrade scripts 2016-07-14 22:59:56 +01:00
Keir Nellyer
da7806147d These brackets don't need to be here 2016-07-14 22:39:59 +01:00
Keir Nellyer
7b5adc717d Prevent non-handlers from closing a report 2016-07-14 22:16:53 +01:00
Keir Nellyer
1885854bc4 Simplify and shorten createReport method 2016-07-14 22:06:25 +01:00
Keir Nellyer
209ca20959 Rename "reportPlayer" to "createReport" for method name consistency 2016-07-14 21:13:06 +01:00
Keir Nellyer
f75806d2dd Ensure messages shown to players are consistent 2016-07-14 21:11:43 +01:00
Keir Nellyer
4ed51b5747 Fix getProfiles and getReports methods 2016-07-14 21:01:49 +01:00
Keir Nellyer
65e8b92c1a Small refactorings (class relocations and renames) 2016-07-14 20:15:14 +01:00
Keir Nellyer
15b5198dbb Ensure words are fully capitalised 
Previously only the first word was capitalised.
 2016-07-14 19:25:53 +01:00
Keir Nellyer
7f48151c8c Made handler messages slightly more prettier 2016-07-14 19:19:16 +01:00
cnr
d54e47d8ea Check for uptimes field 2016-07-14 11:22:10 -05:00
cnr
a0847b8d1a Fix null ServerGroup uptimes value for MPSes 2016-07-14 08:08:24 -05:00
cnr
1a2e0df6ca Only allow OPs to use minestrike debug commands 2016-07-14 07:28:33 -05:00
cnr
1d1c3ef1be Merge branch 'thanos-mineware' into develop 2016-07-14 03:41:00 -05:00
Thanos Paravantis
40345bc93c Fix Bawk Bawk Battles game start 2016-07-14 11:23:39 +03:00
cnr
4d0903dba7 Fix compile error 2016-07-14 03:11:59 -05:00
Shaun Bennett
e28320b361 Fix disableCustom not firing properly 2016-07-14 02:47:49 -05:00
cnr
7cc44c8bfc Merge branch 'thanos-mineware' into develop 2016-07-14 00:22:01 -05:00
Thanos Paravantis
906762e9db Remove debug commands 2016-07-14 08:17:36 +03:00
cnr
917b83250d Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing" 
This reverts commit 30287a0832, reversing
changes made to b8650d741d.
 2016-07-14 00:10:37 -05:00
samczsun
7dcf7378ef Many changes 
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
 2016-07-13 21:30:54 -05:00
cnr
a7b30f4f59 Merge branch 'thanos-mineware' into develop 2016-07-13 21:26:25 -05:00
cnr
4343fa3512 Merge branch 'project-cosmetics' into develop 2016-07-13 21:22:41 -05:00
Shaun Bennett
a34ac42093 Amplifiers adjustment - shards only 2016-07-13 19:26:23 -05:00
LCastr0
6af04b5438 Fixes for winroom gadget disable messages 2016-07-13 18:21:08 -03:00
Thanos Paravantis
6082418fc7 Update game tags on the hub game compass 2016-07-13 23:59:37 +03:00
Thanos Paravantis
4e985b85e6 Make final challenge changes 
- Increase Color Change delay
- Make Tag Master not count for players jumping into the void
 2016-07-13 23:59:01 +03:00
Shaun Bennett
369dabffae Amplifier updates - move to boost shards only 2016-07-13 15:07:24 -05:00
Thanos Paravantis
711a04ffa8 Add Bawk Bawk Battles to hub compass 2016-07-13 21:40:31 +03:00
Thanos Paravantis
3497a4c095 Remove unused debug messages 2016-07-13 19:29:48 +03:00
AlexTheCoder
9c3aee6373 Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA 2016-07-13 11:17:24 -05:00
Thanos Paravantis
6c11b718af Remove suppress warnings annotations 2016-07-13 19:03:39 +03:00
Thanos Paravantis
dab3e09837 Achievement fixes, minor challenge changes 
- Fishing Day was marked as deprecated.
- Surf Up will no longer track waves in which players were killed.
- Make Bouncing Shadow not count players that lost.
- Tag Master will now select alive players only.
- Removed debug messages.
 2016-07-13 18:52:14 +03:00
Thanos Paravantis
ad32f4e2f1 Remove unnecessary new string declaration 2016-07-13 18:05:35 +03:00
Thanos Paravantis
839d9263fd Prevent game crash if started with one player 2016-07-13 18:03:38 +03:00
Thanos Paravantis
efce89a7e7 Fix Color Change platforms not removed properly 2016-07-13 17:47:17 +03:00
Thanos Paravantis
2e5d7c023f Fix Tag Master, show bouncing block full score 2016-07-13 17:13:02 +03:00
AlexTheCoder
2034b5536e Update and enable Clans Freezing 2016-07-13 09:42:46 -04:00
cnr
7df228a8fa Move WinEffectGadget schematics to update folder 2016-07-13 06:36:42 -05:00
Thanos Paravantis
6cef42d7a4 Fix merge issues 2016-07-13 13:36:59 +03:00
Thanos Paravantis
179b59af2c Merge branch 'develop' into thanos-mineware 2016-07-13 13:28:03 +03:00
Thanos Paravantis
943dc88ca4 Modify challenge list, change display messages 2016-07-13 13:23:15 +03:00
cnr
e40abd4859 Merge branch 'thanos-mineware' into develop 2016-07-13 05:04:50 -05:00
Sam
2f6e140b34 Item in hand change (Devourer) 
Changes the item in the NPC's hand for Devourer from OBSIDIAN to a
DIAMOND_CHESTPLATE
 2016-07-12 21:57:37 +01:00
Sam
5382afedda Sharpshooter arrow limit changed to 4 2016-07-12 21:56:25 +01:00
cnr
85db0ad613 Remove global rawr 2016-07-12 15:51:47 -05:00
xXVevzZXx
654ab281ea Add option of "uptimes" to servergroups 2016-07-12 15:44:29 -05:00
Thanos Paravantis
0f3b2da8b7 Fix Bouncing Block, re-add features for testing 2016-07-12 23:02:01 +03:00
cnr
daddaa477e Merge branch 'update/brawl-games' into develop 2016-07-12 06:45:32 -05:00
AlexTheCoder
f0db20dbc2 Fix some minor spelling and grammar issues and implement a requested player freezing system for Clans 2016-07-12 05:21:50 -04:00
AlexTheCoder
3acca23e7e Remove emerald drops from Skeleton King minions and decrease the range EventCreatures can go from their spawn 2016-07-12 05:20:22 -04:00
xXVevzZXx
9cf5a6fb9e Fix Absorption in OP MB, add more arrows to OP MB, fix not being able to purchase primary weapon in MS, fix skin bug in MS and fix helmet drop when scoping in Strike Games 2016-07-12 05:39:21 +02:00
xXVevzZXx
ac8a920484 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
 2016-07-12 03:07:31 +02:00
Sam
5bf0ef545b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-11 23:19:39 +01:00
AlexTheCoder
d3270b9289 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-11 14:50:16 -04:00
AlexTheCoder
30287a0832 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing 2016-07-11 14:46:08 -04:00
AlexTheCoder
69c9ef8074 Implement small ability tweaks for Game Insights team 2016-07-11 14:45:54 -04:00
Sam
f40299e402 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-11 18:34:48 +01:00
AlexTheCoder
0be317e5be Implement tweaks and finalize implementations for bosses and fix loot dropping bugs 2016-07-11 11:36:48 -04:00
Thanos Paravantis
6a87be13f0 Remove features that contain bugs 2016-07-11 01:02:19 +03:00
Keir Nellyer
e1adf7d4e2 JavaDocs 2016-07-10 13:32:20 -04:00
Thanos Paravantis
416b978c4f Apply chicken attack and completion improvements 
- Chicken spectators will no longer receive the compass to prevent
them from teleporting near players.

- The winner of the game will not see the
"You have completed the challenge." message
as the game will end afterwards.
 2016-07-10 15:16:17 +03:00
Thanos Paravantis
5a7e7c7623 Challenge bug fixes and improvements 
- Added crumble feature to Block Lobbers
- Increased TNT height on Water Horror
- Increased Lava Run difficulty
- Fixed unclickable Bawk's Food Kit
- Fixed chickens not attacking properly on chicken attack
- Fixed dominant team not winning on team based challenges
- Fixed spectators being able to break blocks on Treasure Digger
 2016-07-10 13:32:24 +03:00
Keir Nellyer
3b38a0ab65 Make interval display seconds when interval is less than a minute 2016-07-09 23:51:48 -04:00
Keir Nellyer
e607960b6a Fix time intervals on report site not displaying correctly 
Before this would display values such as "0 minute ago" and "1 minutes
ago".
 2016-07-09 23:48:14 -04:00
Keir Nellyer
b808121d68 Make ReportResult and ReportMessage timezone friendly. 
This switches all if not most of the report feature code to using the
 new Java 8 date time API since it is much better for handling
 timezone's.

 This commit also creates a few new methods in UtilTime as they are
 used throughout the "report" and "chatsnap" packages. They may also
 come in useful for other developers using timezones.
 2016-07-09 23:41:39 -04:00
Keir Nellyer
3f8eaf0da7 Missing semi-colon 2016-07-09 22:56:32 -04:00
Keir Nellyer
be8050a556 Make player ranks display better on report site 2016-07-09 22:47:38 -04:00
Keir Nellyer
edf63dcafd Print exceptions for everything!!! 2016-07-09 18:09:26 -04:00
Keir Nellyer
ac95a59f81 Mark reports as expired when an expired report is detected 
Also wrote JavaDocs for expireReport and saveReport methods.
 2016-07-09 15:47:31 -04:00
Keir Nellyer
d7736e9e02 Wait until report data has been saved to the database, otherwise the 
message task will not function until it's second iteration
 2016-07-09 15:32:46 -04:00
Keir Nellyer
400a6adab2 Show message when report has been closed 
Also run Bukkit API methods synchronously.
 2016-07-09 15:24:41 -04:00
Keir Nellyer
e26ced1438 First report handler detail message should be instant 2016-07-09 14:59:27 -04:00
Keir Nellyer
5c6cac2849 Remove debug line 2016-07-09 14:57:55 -04:00
Keir Nellyer
c909cd4733 A report is active if it is being handled but has not yet been closed 2016-07-09 14:55:42 -04:00
Keir Nellyer
6a78556fda Ninja fix for previous commit 2016-07-09 14:49:00 -04:00
Keir Nellyer
aadb3df715 A report is no longer active if a result for it has been set 2016-07-09 14:48:26 -04:00
Keir Nellyer
29b1110f6b Access to SnapshotsManager inside ReportManager is no longer required 2016-07-09 14:40:17 -04:00
Keir Nellyer
1eb3fb4aa3 Modify GET_REPORTS_HANDLING query to ignore closed reports 2016-07-09 14:38:12 -04:00
Keir Nellyer
c98c352546 Prevent reputation from being 0, this causes all reports the player 
opens to be instantly closed
 2016-07-09 14:37:23 -04:00
Keir Nellyer
87df6804c9 Improve code and error logging 2016-07-09 14:36:30 -04:00
Keir Nellyer
0783f3b693 Fix sql error when a report is closed due to expiration 2016-07-09 11:31:51 -04:00
Thanos Paravantis
a9f41ab269 Refactor project classes 2016-07-09 12:00:06 +03:00
Keir Nellyer
abea5bbf81 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-08 23:27:07 -04:00
Keir Nellyer
5c83f09456 SnapshotRepository no longer extends MinecraftRepository 
It doesn't need to.
 2016-07-08 23:26:33 -04:00
Keir Nellyer
d9288277d5 Push chat snapshots from all servers 
This fixes an issue whereby the handler would not be able to see chat
 snapshots unless they begin the handling process whilst connected to
  the same server as the offender.
 2016-07-08 23:22:55 -04:00
xGamingDudex
b8650d741d Fixed PC-707 
Fixed arrows damaging the shooter.
Fixed all instances of arrows bouncing of targets.
 2016-07-08 16:48:17 -05:00
xGamingDudex
96d16be5b7 Fixed PC-706 
Tweaked settings to reasonable values in local testing.
 2016-07-08 16:48:11 -05:00
Timothy Andis
2cac4c9c66 Remove toLowerCase owner method 2016-07-08 16:17:48 -05:00
Keir Nellyer
a0d046ab8b Optimize getting of ReportProfile's from database 2016-07-08 17:14:41 -04:00
Sam
d7f71f2d15 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-07-08 22:10:20 +01:00
Sam
34565b2975 PC-699 
/bc in MPS is now protected by the filter
 2016-07-08 22:09:48 +01:00
TadahTech
cbb0fa37fb Lang tweaks. 2016-07-08 15:32:25 -05:00
cnr
5b98bfddce Update YouTube link to landing + sub confirmation 2016-07-08 15:20:50 -05:00
Sam
07b65ad1c9 PC-621 
Doors can now be opened in Block Hunt
 2016-07-08 21:01:15 +01:00
Sam
af9611dcfd Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-07-08 21:00:34 +01:00
Thanos Paravantis
331c1bcf91 Merge branch 'develop' into thanos-mineware 2016-07-08 22:29:59 +03:00
Thanos Paravantis
7887c96cc9 Decrease delay between challenges 2016-07-08 22:28:53 +03:00
TadahTech
1313db4071 Commit lost file. 2016-07-08 14:06:16 -05:00
Thanos Paravantis
7ba7414101 Improvements, refactoring and bug fixes 
- Fixed heights not being calculated correctly on Kangaroo Jump.
- Fixed platform not being removed entirely on Color Change (needs confirmation).
- Fixed death effect items not spawning on Treasure Digger.
- Fixed TNT not reaching players on Water Horror.
- Fixed Dogs Vs Cats hologram being displayed continuously (flashing) (needs confirmation).
- Increased score hologram elevation rate.
- Spawn locations are automatically centered.
- Border is now far away from challenges.
- Refactored main game class.
 2016-07-08 21:30:43 +03:00
TadahTech
ce72d25832 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-08 13:09:02 -05:00
TadahTech
8c7308add5 Add documentation. 
Refactor code.
Remove most command backend capabilities to limit user error.
Cleanup.
 2016-07-08 13:08:34 -05:00
Sam
42c578be9d PC-612 
Fixes an issue that removing Co-host from someone would remove their
creative mode in Master Builders.
 2016-07-08 17:54:42 +01:00
Sam
c16f9ec9ec PC-688 
Changes the description in Draw My Thing so that it reflects changes
made to the tip system.
 2016-07-08 17:53:22 +01:00
Sam
c607654c51 PC-692 
Fixes an issue that allowed staff spectators to damage the King in
Castle Siege
 2016-07-08 17:50:33 +01:00
Sam
7940eeb0ee PC-633 
Allows humans in Wither Assault to place blocks under the map, allowing
them to no longer get stuck
 2016-07-08 17:49:38 +01:00
Sam
aae24d862a Revert "PC-692" 
This reverts commit 7865b1ef80.
 2016-07-08 17:38:53 +01:00
Sam
7865b1ef80 PC-692 
Allows humans in Wither Assault to place blocks anywhere so that players
are not able to get stuck in the ground
 2016-07-08 17:37:32 +01:00
Alex-The-Coder
e8a1c9bcba Add damage check to the Enchantment Handler... 
...to avoid performing calculations where it is not necessary
 2016-07-08 07:42:00 -04:00
xGamingDudex
4aad663bec Left over from merge 2016-07-08 03:59:16 +02:00
xGamingDudex
5349d26115 Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders 2016-07-08 03:41:13 +02:00
xGamingDudex
d276d8ca5d Removed "Failure" feature and cleaned some code 2016-07-08 03:40:37 +02:00
Keir Nellyer
1ce1c796f4 Repository classes no longer need to extend MinecraftRepository 2016-07-07 21:12:08 -04:00
Keir Nellyer
b9f1dcbcd5 Make method getReportPrefix(Report) simpler 2016-07-07 21:05:41 -04:00
Keir Nellyer
8d2916c23e Create JavaDoc's for all methods in ReportManager 2016-07-07 21:04:16 -04:00
xGamingDudex
c50ec49ad9 Minor updates 
Tweaked some location values.
Added more event handling to the reveiw hub and mavericks hub.
Added builder info holograms to all sides of the display slots in the
mavericks hub.
 2016-07-08 02:59:33 +02:00
Keir Nellyer
cb555a41ab Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-07 20:47:19 -04:00
xGamingDudex
2659e9be09 Removed failure and smaller updates 2016-07-08 02:06:34 +02:00
Keir Nellyer
0dc17bf6fa Further code cleanup 2016-07-07 18:12:52 -04:00
Keir Nellyer
58df3022a5 Completely remove old staff notifications system 2016-07-07 18:08:19 -04:00
Sam
da9ad913b2 Finalisation of update 2016-07-07 23:03:23 +01:00
Keir Nellyer
dc566c8fb3 Remove redundant ReportServer entry from Maven POM 2016-07-07 17:59:55 -04:00
Keir Nellyer
bc2b7884ee Make this code a lot smarter 2016-07-07 17:57:19 -04:00
Keir Nellyer
e6de1ec13e Renamed for easier understanding of the class's function 2016-07-07 17:51:05 -04:00
Keir Nellyer
aab5daa446 Remove old ReportServer and move site related files to ReportSite 
directory
 2016-07-07 17:49:06 -04:00
Keir Nellyer
4361379eaa Close expired reports when they are detected 
This improves performance and allows for easier database maintenance.
 2016-07-07 15:35:47 -04:00
Keir Nellyer
4e0287ad03 Re-import report feature classes in Hub and Arcade 2016-07-07 14:01:18 -04:00
Keir Nellyer
77a98bc250 Remove spammy and useless report notifications 2016-07-07 13:58:09 -04:00
Keir Nellyer
fa02b18ffb These shouldn't be batched as there will only ever be a single query 2016-07-07 13:28:08 -04:00
Keir Nellyer
175c3523f8 Remove todo relating to removal of database cleanup of chat entries 
after a report has been closed

An external cleanup job/script will be used to remove old data
 2016-07-07 13:19:42 -04:00
xXVevzZXx
783b20a0dc Disable champions abilities in smash dom and disable supply chests, adjust peace announcement in Strike games, Absorbtion fix in OP MB, Countdown in CHanging Kits, more Arrows in OP MB, regen hunger in skysmash, scoped players drop helmets now, fix stuff with identifiers in GunModule 2016-07-07 15:08:57 +02:00
cnr
443576ba1a Update YouTube link and send shard reward message 2016-07-06 20:15:41 -05:00
samczsun
63b6158fe4 More UHC Fixes 
Fixes:
PC-137
PC-138
PC-497
PC-665
PC-710
PC-719
PC-754
Also fixes chunk synchronization issue, plugs potential memory leaks

Fancy spectating

Use enum priorities
 2016-07-06 15:55:12 -04:00
Shaun Bennett
8cf470cfd0 Update fountain goals 2016-07-06 13:39:56 -05:00
cnr
17f89f6937 Merge branch 'project-cosmetics' into develop 2016-07-06 13:00:29 -05:00
Thanos Paravantis
04f0ef199c Make CustomFirework singleton class public 2016-07-06 20:47:28 +03:00
LCastr0
63500c19c9 Removed commented lines 
Added javadocs to GadgetChangeEvent
 2016-07-06 14:45:05 -03:00
Thanos Paravantis
989dd98212 Fix players not losing on Pick a Side 2016-07-06 20:41:26 +03:00
Thanos Paravantis
6a66d6cc92 Lower barrier spawn chance on Cloud Fall 2016-07-06 20:40:51 +03:00
Thanos Paravantis
7319965c45 Temporarily fix challenge completion/lose issues 2016-07-06 20:40:15 +03:00
Thanos Paravantis
47f62e2c89 Make lava run a bit more difficult 2016-07-06 20:39:37 +03:00
xXVevzZXx
36285ee101 Improve GunModule with editable variables 2016-07-06 18:55:13 +02:00
xXVevzZXx
4dedd27227 finish up editing of arrays for gamemodes 2016-07-06 18:34:15 +02:00
Thanos Paravantis
185ba600ca Merge branch 'develop' into thanos-mineware 2016-07-06 17:48:31 +03:00
Thanos Paravantis
e326fd322c Update Pick a Side, refactor Reverse Tag 2016-07-06 17:45:51 +03:00
Thanos Paravantis
29434b786e Apply completion/lost bug fixes 2016-07-06 17:45:22 +03:00
xXVevzZXx
3e77ce0f00 make arrays parseable by variables 2016-07-06 14:03:41 +02:00
xXVevzZXx
a430f7e94d Add chat messages for Peace Phase, remove arrows from chests, disable crafting, fix dropped pumpkins and disable weapon enchantments 2016-07-06 13:45:31 +02:00
Thanos Paravantis
ab4174cfb9 Refactor Red Light, Green Light and Volley Pig 2016-07-06 12:04:04 +03:00
Thanos Paravantis
e0d133ab67 Broadcast a message when timer runs out 2016-07-06 11:10:57 +03:00
Thanos Paravantis
de74716abf Refactor Treasure Digger and Volley Pig 2016-07-06 11:10:21 +03:00
Thanos Paravantis
ae60d05bbb Refactor Wave Crush 2016-07-06 10:25:20 +03:00
Thanos Paravantis
b40346417a Remove unused project files 2016-07-06 10:25:05 +03:00
LCastr0
67adb34311 Fixes for the WinRooms 
Removed Freedom Chests from the menu
 2016-07-06 00:00:50 -03:00
AlexTheCoder
eccd7deedc Fix merge errors and properly force disable particles by checking the game's settings 2016-07-05 17:25:01 -04:00
AlexTheCoder
8c93f92a92 Tweak all Necromancer abilities so they function well together and give the Necromancer a semi-AI for movement 2016-07-05 17:08:38 -04:00
Thanos Paravantis
0eab6db116 Soccer bug fixes and minor improvements 
- Slimeball will no longer be able to get stacked.
- Players in soccer mode will not able to stack others.
- Guardian lazer can no longer be used in the soccer field.
- Players in soccer won't get knockback, except if they double jump.
 2016-07-05 15:39:10 -05:00
Thanos Paravantis
607b92984e Fix hologram elevation speed 2016-07-05 23:18:29 +03:00
Keir Nellyer
67213ec696 Tie all these together 2016-07-05 16:14:30 -04:00
TadahTech
9f58e57a67 Bug fixes. 2016-07-05 14:35:37 -05:00
Thanos Paravantis
00c3584c0b Make score holograms elevate faster 2016-07-05 21:14:13 +03:00
Thanos Paravantis
6a8c30d496 Refactor Mini OITQ and Water Horror 2016-07-05 21:13:49 +03:00
Thanos Paravantis
071f0c4de7 Refactor Ore Run and Rush Push 2016-07-05 19:39:30 +03:00
Thanos Paravantis
f36244efc6 Refactor Lava Run and Milk a Cow 2016-07-05 19:27:59 +03:00
Thanos Paravantis
108031acf1 Refactor Kangaroo Jump and King of the Ladder 2016-07-05 18:53:53 +03:00
Thanos Paravantis
f64234e4d1 Refactor Falling Blocks and Fast Food 2016-07-05 18:14:31 +03:00
Connor James
c0680b3511 Merge pull request #130 from Mineplex-LLC/bugfix/mopple-sprint 
Numerous Bug fixes
 2016-07-05 10:01:58 -05:00
AlexTheCoder
b409009069 Create a way to remove siege weapons for testing 2016-07-05 10:05:53 -04:00
Thanos Paravantis
ba02c94e08 Refactor Dogs Vs Cats and Egg Smash 2016-07-05 17:00:38 +03:00
Thanos Paravantis
5d01bc2863 Refactor Deadly TNT and Diamond Hunt 2016-07-05 16:30:51 +03:00
Thanos Paravantis
fe89a0f094 Refactor Cloud Fall and Color Change 2016-07-05 16:17:19 +03:00
Thanos Paravantis
361e857bc7 Refactor Build Race and Chicken Shooting 2016-07-05 15:54:43 +03:00
Thanos Paravantis
3f13c5f518 Refactor Block Lobbers and Bouncing Block 2016-07-05 14:52:25 +03:00
AlexTheCoder
cc7fc164bb Implement Necromancer boss and give it some beginning attacks 2016-07-05 07:52:21 -04:00
AlexTheCoder
b51ee4a066 Create an event for stronger control over Velocity changes 2016-07-05 07:51:41 -04:00
Thanos Paravantis
4789f640b2 Refactor Anvil Dance and Arrow Rampage challenges 2016-07-05 13:57:05 +03:00
Thanos Paravantis
ce3117ba4b Fix anvils staying on map after challenge end 2016-07-05 13:03:42 +03:00
Thanos Paravantis
9f45c0a622 Use offset2d instead of offset 2016-07-05 13:03:02 +03:00
Thanos Paravantis
9cec81ee34 Define border after challenge is started. 
Previously, the border was defined in the challenge constructor,
as a result the boundaries were not set correctly. That's because
the map center on each challenge is defined in the constructor, and
since the super one is called before the challenge constructor, the map
center which defines part of the border was not correct.
 2016-07-05 12:35:27 +03:00
Thanos Paravantis
dd55d96ccf Delay glass removal when obsidian is far away 
On Lava Run, when obsidian is generated far away from the last
created obsidian block, a delay of 1 second will be added to the
total delay until the platform is removed, because normally glass
is removed very quick.
 2016-07-05 12:32:44 +03:00
Sam
295711d626 PC-632 
Fixes an issue where going under the map in Wither Assault would cause
you to have negative speed and not be able to move
 2016-07-04 20:31:59 +01:00
Thanos Paravantis
d393ffcc51 Update debug commands for Sr.Mods 2016-07-04 22:06:01 +03:00
Thanos Paravantis
4397784f35 Add new challenge completion effect 2016-07-04 22:05:34 +03:00
TadahTech
978ee0055a Bug fixes. 2016-07-04 09:15:47 -05:00
TadahTech
0ebddf9f45 Add UI Item. 
Add check to make sure player's cant be invited to another party if they're already in one.
Bug fixes.
 2016-07-04 05:43:01 -05:00
TadahTech
584c8f50f0 PC Party bugs and tweaks. 2016-07-04 05:12:02 -05:00
TadahTech
06feb615a9 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-04 04:18:01 -05:00
Sam
5644589b10 PC-541 
Covers all possible eventualities of redstone ore and glowing redstone
ore
 2016-07-03 20:57:58 +01:00
Sam
e96f7f1217 PC-508 
Fixes a hit box issue with Rocket Slimes
 2016-07-03 15:58:54 +01:00
Sam
bdc049efe1 PC-508 
Fixed an NPE with Inferno
 2016-07-03 15:58:19 +01:00
AlexTheCoder
5c37a6ceca Repair spider boss death 2016-07-03 06:33:53 -04:00
AlexTheCoder
0a67d381a3 Prevent bosses from leaving their arena 2016-07-03 05:44:05 -04:00
AlexTheCoder
28853feb73 Update Iron Wizard mechanics 2016-07-03 05:43:50 -04:00
AlexTheCoder
f1733875eb Change rupture animation 2016-07-03 05:43:05 -04:00
AlexTheCoder
e57910985c Change earthquake animations 2016-07-03 05:42:44 -04:00
AlexTheCoder
37d11cdd60 Make Meridian Scepter stronger 2016-07-03 05:41:59 -04:00
AlexTheCoder
caf7e1086d Completely revamp Iron Wizard boss, add spawn and despawn messages, and retire attacks that no longer fit the arena 2016-07-03 04:12:05 -04:00
AlexTheCoder
af9d91faa8 Further prevent nullpointer errors 2016-07-03 04:11:14 -04:00
AlexTheCoder
d0a8ee18c0 Fix concurrent modification error caused by poison looping every tick 2016-07-02 19:07:55 -04:00
samczsun
ceb62f8dc9 Fix lore 2016-07-02 18:41:20 -04:00
AlexTheCoder
b3c230082a Allowed Meridian Scepter to damage non-player entities 2016-07-02 18:34:35 -04:00
AlexTheCoder
1ce6f3f65f Stop webs from editing banners (PC-610) 2016-07-02 18:16:04 -04:00
AlexTheCoder
ffdc7b4be0 Temporarily patch random nullpointer 2016-07-02 18:05:26 -04:00
AlexTheCoder
9898b3d95d Fix block state not saving on restore (Untested) (PC-610) 2016-07-02 18:02:59 -04:00
AlexTheCoder
32c91e2e0c Make start command more informative 2016-07-02 17:52:04 -04:00
AlexTheCoder
d4be749edc Update Iron Wizard attack priority to use Earthquake when surrounded, lower blocks thrown during Cave In and implement Iron Skin arrow resistance 2016-07-02 17:47:19 -04:00
samczsun
1655811d43 Added help messages to WorldEvent command 2016-07-02 17:47:13 -04:00
samczsun
54cda56c11 Initial Commit 2016-07-02 17:16:42 -04:00
LCastr0
050ae75e49 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-02 13:33:33 -03:00
LCastr0
7a6335a021 Fixes for win rooms? Or not yet?! 2016-07-02 13:32:35 -03:00
Sam
26361eaee0 PC-508 
Fixes certain abilities in Team SSM that could be used to
damage/knockback other team members
 2016-07-02 13:38:22 +01:00
Sam
8d8824446d PC-519 
Fixes an issue where grenades would not do damage after you die.
 2016-07-02 12:12:15 +01:00
AlexTheCoder
2b74ec00b4 Change display menu for CUST-1 server to reflect recent updates 2016-07-02 01:32:47 -05:00
AlexTheCoder
e4c94f5421 Fix whitelist for Customer Support servers 2016-07-02 01:32:42 -05:00
AlexTheCoder
5e994e37da Fix Monster Maze jumping mechanics (Fixes PC-711 and PC-634) 2016-07-01 16:37:03 -05:00
Thanos Paravantis
e2663d6448 Move spawn related methods to challenge classes 2016-07-01 17:18:03 +03:00
Thanos Paravantis
6fdbda0ed0 Refactor Dogs Vs Cats challenge 2016-07-01 17:04:06 +03:00
Thanos Paravantis
8101fced7b Detect correct volley pig block and fix its spawn 2016-07-01 13:58:21 +03:00
Thanos Paravantis
568cbb2672 Prevent infinite spawn search loops by /mark cmd 2016-07-01 12:32:31 +03:00
Thanos Paravantis
7379b2069b Make volley pig map size and spawns dynamic 2016-07-01 12:31:41 +03:00
Thanos Paravantis
baca63dcae Merge branch 'develop' into thanos-mineware 2016-07-01 11:43:56 +03:00
samczsun
f6d882fcb4 Disallow placing throwing tnt 2016-06-30 21:12:12 -05:00
samczsun
c442376ccc Oops 2016-06-30 22:04:34 -04:00
AlexTheCoder
005189c2d4 Edit kit items in OITQ to fix bow instant charge glitch (Fixes PC-203) 2016-06-30 17:41:09 -05:00
AlexTheCoder
b0303a8870 Create new equations for Protection Enchantment functionality to make it work properly (Further fix for PC-311) 2016-06-30 17:41:09 -05:00
AlexTheCoder
37e50df948 Make kits ensure association with players using them (Fixes PC-588) 2016-06-30 17:41:09 -05:00
AlexTheCoder
9c4b787436 Make protection enchantments actually protect wearer from damage (Fixes PC-311) 2016-06-30 17:41:09 -05:00
AlexTheCoder
36bb0b9ae8 Force player visibility to refresh in games over a steady rate (Fixes PC-497) 2016-06-30 17:41:09 -05:00
samczsun
3e1c44bfa3 UHC improvements 
Lots of hacky NMS stuff. Ask me if you're confused

Basically, decorate the world async
Keep spawn chunks loaded
Make sure view distance is capped so no chunks are genned on teleport
Add regeneration and resistance on spawn to prevent damage
Set health objective score manually
Teleport player two times to ensure no block glitching
Disable kicking and NCP while teleporting
 2016-06-30 17:15:01 -05:00
Keir Nellyer
fbc1724111 Rewrite this condition to make more sense 2016-06-30 17:51:16 -04:00
Keir Nellyer
82894eacaa Remove todo as this is confirmed working 2016-06-30 17:43:06 -04:00
Keir Nellyer
164d1c580d Check if date time is before correctly 2016-06-30 17:40:12 -04:00
Keir Nellyer
7db7c0914e Get time since report has been created 2016-06-30 17:23:29 -04:00
xGamingDudex
0393e682c3 Merge clean up 
Every bloody time there are files who don't want to join the rest in the
merge commit.... >.>
 2016-06-30 23:10:28 +02:00
xGamingDudex
6d9e84b817 Merge branch 'develop' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
 2016-06-30 23:08:31 +02:00
xGamingDudex
03511a7234 Updated values 
Updated teleport mav world value to fit new version of the map.
Split themes of multiple words to new lines.
Fixed bug where 16+ long lines on scoreboard would get random colors.

Seem to have forgotten to include the MavWorldManager earlier... ups.
 2016-06-30 22:56:26 +02:00
Sam
40124b2cdd Updated changed method name (getThrower) 
In the ProjectileData class GetThrower was changed to getThrower, this
fixes that in any of my classes
 2016-06-30 17:19:53 +01:00
Sam
69bd4006d4 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-30 17:14:38 +01:00
samczsun
045e1b3064 Fix various Clans bugs 
Viper destroying armor
Legendaries not saving properly
Combat log NPC for vanished players
 2016-06-30 05:20:44 -05:00
Thanos Paravantis
e25a6e4327 Reset leap data when needed (death/quit/game end) 2016-06-30 05:18:39 -05:00
Thanos Paravantis
5c60819179 Prevent NPE on player interact event 2016-06-30 05:18:39 -05:00
Keir Nellyer
c076a46078 Show all involved users correctly 2016-06-29 22:13:13 -04:00
Keir Nellyer
1c73d2a793 Fix age of report not showing when no chat messages 
Use a dummy value for now until I get the system to calculate the age
 of the report.
 2016-06-29 18:16:26 -04:00
Keir Nellyer
a3f4a4c185 Change message for when there are no chat messages for a report 2016-06-29 18:07:26 -04:00
Keir Nellyer
e1a32b6da0 Show error messages for reports which do not have any related chat 
messages
 2016-06-29 18:06:30 -04:00
xGamingDudex
f9208b67ef Added schematic support for ground in MB. 
Also fixed an NPE and moved a constructor to protected.
 2016-06-29 15:19:46 +02:00
xXVevzZXx
880ac6b88f Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes 2016-06-29 06:21:18 +02:00
Keir Nellyer
d2b1a7b0c1 Add todo for handling invalid report number input 2016-06-28 21:50:33 -04:00
xGamingDudex
32ee27d9ee Small bugfixes with QA 
Never re-show reviewed builds in review-server.
Toggle debug messages in review-server.
Fixed minor bugs with QA
 2016-06-29 03:49:53 +02:00
xGamingDudex
9d8eb1f044 ArcadeManager doing .zip check, but not acting upon it 2016-06-29 03:46:58 +02:00
LCastr0
671dcaf3aa Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-28 18:14:05 -03:00
LCastr0
24186d9992 More fixes for gadget persistence 2016-06-28 18:11:00 -03:00
Thanos Paravantis
04cb0fb0b0 Use updated ProjectileUser method names 2016-06-28 23:09:52 +03:00
Thanos Paravantis
4436ba0710 Merge branch 'develop' into thanos-mineware 2016-06-28 23:05:11 +03:00
Thanos Paravantis
c5c08562c3 Merge branch 'master' into thanos-mineware 2016-06-28 23:01:42 +03:00
Thanos Paravantis
42ebb95db1 Fix NPE on zombie infection 2016-06-28 21:57:32 +03:00
Thanos Paravantis
973666a42f Improve challenge selection system 
- Game will no longer end unexpectedly, when all challenges are played.
- Challenges are now marked correctly as played.
 2016-06-28 21:57:17 +03:00
Thanos Paravantis
5e9f16424c Add shouldDie method, update zombie wrapper name 2016-06-28 20:38:32 +03:00
Thanos Paravantis
43f375fd86 Reset team data on team challenges 2016-06-28 20:37:26 +03:00
Thanos Paravantis
eea980b354 Apply smoother knockback on volley pig 2016-06-28 18:41:50 +03:00
Thanos Paravantis
c5367d4510 Remove double plants entire from spawn locations 2016-06-28 12:15:49 +03:00
Thanos Paravantis
cf434b92de Modify punch the pig description 2016-06-28 11:47:47 +03:00
Thanos Paravantis
dc250d4bf2 Store locations after game start (fix NPE) 2016-06-28 11:47:25 +03:00
Thanos Paravantis
7218dc710f Retrieve scoreboard data only when possible 2016-06-28 11:46:38 +03:00
xGamingDudex
8ad63ef7ea Tweaked some code to better fitt schematics. 2016-06-28 06:29:44 +02:00
xGamingDudex
cd5555c3f9 Fixed invis entities after pasting blocks + removed debug code 2016-06-28 04:03:40 +02:00
Keir Nellyer
561734e7fe Remove unused imports (accidentally added) 2016-06-27 21:18:40 -04:00
AlexTheCoder
beeddfedd4 Force the ball to drop if the carrier is AFK 2016-06-27 21:07:44 -04:00
xGamingDudex
a69101bef3 Cleaned out some debug messages and added some java-docs. 2016-06-28 01:35:37 +02:00
xGamingDudex
65e05b9d8c Small polish on Mavericks Master Builders 2016-06-28 01:13:34 +02:00
AlexTheCoder
5b32eb4815 Update to Kit Progression system 2016-06-27 18:47:15 -04:00
AlexTheCoder
119931ac71 Remove unneeded Data Loc 2016-06-27 18:33:01 -04:00
AlexTheCoder
ab315627ad Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-06-27 17:45:36 -04:00
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
xGamingDudex
d6672c44f4 Finalized the hub module and finished local testing 
Cleaned up some source. Applied some small updates. Finished local
testing.
 2016-06-27 00:34:17 +02:00
xGamingDudex
966eaf1616 Fixed some entity tracking bugs regarding chunk update packets 2016-06-27 00:16:04 +02: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
c966620808 Change resourcepack links 2016-06-25 19:52:22 +02:00
xXVevzZXx
fbd9b17ba0 fix playeringametime being 0 2016-06-25 12:35:59 -05:00
xXVevzZXx
8d4f5f0f93 Modularize Minestrike and add Strike Games 2016-06-25 19:11:08 +02:00
Thanos Paravantis
a714144159 Implement new challenge selection system 
The new challenge selection system stores only one instance of each
challenge, instead of creating new ones when the next challenge is
selected. In addition to that, challenge data is now reset every time
the challenge ends to be able to reuse the same resources.

In a future commit, I might as well only generate the spawnpoints once
in an attempt to make things as quick as possible. The new system may have
some bugs, since it's not fully tested with QA yet.
 2016-06-25 13:19:09 +03:00
Thanos Paravantis
bc229c44aa Apply small changes to Zombie Infection 2016-06-25 11:56:55 +03:00
xXVevzZXx
7a55b131d4 Add SmasgDom, Smash Glags, Tiny Smash, Smash Sheep, Sky Smash, Changing Kits and OP Sheep 2016-06-25 09:11:42 +02: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
TadahTech
50759661cf Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-24 23:52:27 -05:00
xXVevzZXx
b34d652617 Add Lucky Bridges, CookieFight and OP MB 2016-06-25 06:35:08 +02: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
xXVevzZXx
285d94a2ca Fill hotbar editor with glass panes 2016-06-25 04:48:59 +02: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
TadahTech
0cda8ab7a3 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-24 04:11:59 -05:00
TadahTech
8fbb06ae3d Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-06-24 04:11:38 -05: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
TadahTech
e71fc291d1 Fix cross server invites / joining servers. 2016-06-24 04:01:51 -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
TadahTech
c204562eb3 Fix cross server invites / joining servers. 2016-06-23 23:25:26 -05:00
TadahTech
eeaf9fa49a Fix chat in arcade 2016-06-23 23:24:50 -05:00
TadahTech
ce1aab5e11 Fixes and changes 2016-06-23 21:53:12 -05: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
Sam
f8080d2663 PC-574 
Another fix for the minestrike vanish problem, this one fixes staff
being assigned teams on join.
 2016-06-23 22:40:15 +01:00
xXVevzZXx
dc57f7b4e6 add testrank command for SR.Mods 2016-06-23 22:05:26 +02: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
TadahTech
69c7c9edc8 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-23 03:13:10 -05:00
TadahTech
a29b22b8be Undo comments. 2016-06-23 03:12:49 -05:00
TadahTech
33cce620be Update UI and fix typos 2016-06-23 03:11:45 -05:00
TadahTech
df53021f7c Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again. 2016-06-23 02:56:42 -05:00
TadahTech
fb6a772eb0 Fix Party Redis. Improve Party UI. General testing and fixing. 2016-06-23 02:39:05 -05: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
xGamingDudex
31352a86d7 Added Mavericks module to Hub 2016-06-23 01:17:16 +02:00
Alex-The-Coder
2453f82061 Rename Filterbutton.java to FilterButton.java 2016-06-22 18:40:12 -04:00
TadahTech
50534c3af9 UI And server manager changes 2016-06-22 17:28:43 -05:00
AlexTheCoder
56205a2505 Change scoring behavior to increase accuracy, increase power of right click throw, solve players becoming stuck in webs and border, solve ball becoming stuck outside border, perform other small gameplay tweaks 2016-06-22 18:25:32 -04:00
Thanos Paravantis
4e9ea23db8 Fix spawn facing, separate scoreboard functions 2016-06-22 21:47:39 +03:00
Shaun Bennett
e855a866c7 Fix more thanks and booster occurrences 2016-06-22 08:58:27 -07:00
xGamingDudex
318c137aba Moved mavericks repository resources to core, merging review and game 2016-06-22 17:08:34 +02:00
TadahTech
e53b474f3f Fix typo. 2016-06-22 00:59:22 -05:00
TadahTech
ebff8f865b Undid a little too much. 2016-06-22 00:58:30 -05:00
TadahTech
38a13d01f1 Open server menu properly 2016-06-22 00:56:44 -05:00
TadahTech
d9c5e6323a Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-22 00:36:23 -05:00
TadahTech
4d31867e98 PC Party updates. 2016-06-22 00:35:57 -05:00
samczsun
d739df8623 UHC is faster now 2016-06-21 22:21:27 -05:00
Sam
0131850fc3 SSM fixes 2016-06-21 20:41:53 +01: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
TadahTech
e39326b592 Help Command UI. 2016-06-21 00:11:33 -05:00
TadahTech
b75e87753d Party UI work. 2016-06-20 22:45:53 -05:00
TadahTech
a49e815765 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-20 16:40:33 -05:00
TadahTech
2211cf4dec Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-06-20 16:37:07 -05: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
Sam
a830b5b388 Removal of debug message and compilation error 2016-06-19 17:12:58 +01:00
Sam
e8b8a3cd66 PC-504 
Fixes an issue where if players in SSM destroyed all of the spawn point
locations, players would not be handled correctly
 2016-06-19 17:10:22 +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
TadahTech
5316dfe0c6 Remove Spammy "Loaded default kit message". 
Fixed SSM kits not closing the GUI when the central item is clicked.
Fixed Smash Crystals being carried over into the next game.
 2016-06-19 02:09:17 -05:00
xXVevzZXx
95649a5f14 adjust amount of gems as win reward 2016-06-18 20:48:55 -05:00
Thanos Paravantis
cac0169827 Add last player to a random team 2016-06-18 23:51:51 +03:00
Thanos Paravantis
4c31e79e20 Allow team challenges with odd amount of players 
May apply more changes or improvements.
 2016-06-18 23:18:11 +03:00
Shaun Bennett
a8e67eda88 Rename tip message PC-566 2016-06-18 14:45:39 -05:00
Shaun Bennett
2f0a559441 Add reload command, change podium to lime dye, change tip message 2016-06-18 14:41:32 -05:00
Shaun Bennett
690c6160b9 Green Armor 2016-06-18 14:27:53 -05:00
Thanos Paravantis
0b5e409ab8 Make /lose available for all to use on QA testing 2016-06-18 21:02:54 +03:00
Thanos Paravantis
fc50c90301 Update chicken attack 
- Remove unnecessary clone() method.
- Change chat message when chicken attack is triggered.
- Rename customizeChicken to setupChicken method.
- Use Math.random() instead of UtilMath.random.nextDouble()*100.
- Add hologram that displays "Chicken Minion" above every chicken.
- Increase look at player radius to 4.
- Use generic List instead of ArrayList.
 2016-06-18 21:01:46 +03:00
Thanos Paravantis
0368500ad7 Replace QuickChangeBlockAt with resetBlock method 2016-06-18 20:56:59 +03:00
Thanos Paravantis
bccce7593f Update second Lava Run to patch obsidian bugs 2016-06-18 20:56:33 +03:00
Sam
d167f93486 PC-507 
Fixes an issue where Blaze's "Firefly" and "Phoenix" abilities did no
damage or knockback.
 2016-06-18 15:33:39 +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
Sam
c19af4e1c5 PC-505 
Fixed an issue where players could hit team members with Bouncy Bacon
and get the health bonus from it.
 2016-06-18 00:04:03 +01:00
Sam
09957c203b PC-506 
Fixes an issue where the creeper's passive in SSM would activate when
they took starvation damage.
 2016-06-17 22:24:46 +01:00
Shaun Bennett
5f9a57b7e2 Lower booster tip cooldown to 1 minute 2016-06-17 16:10:01 -05:00
Shaun Bennett
4e3062f413 Swap Cosmetic and Booster interface slot 2016-06-17 15:23:53 -05:00
Sam
35b00679e0 PC-516 
When out of leaps in dragon escape there is no longer the "You can now
use Leap" message.
 2016-06-17 18:08:37 +01:00
xGamingDudex
d6afe986ea Update and mavericks-review-hub plugin [stand alone] 
Added NBT Utils
Added Format util for color
Fixed bounding box calculations in UtilBlock
Improved getPlugin in UtilServer
Added BuildDataCylinder
Added Particle support for saving builds
Added Debug command to BuildMavericks
Changed some backend DB stuff for saving builds

Added mavericks-review-hub plugin:
*
 2016-06-17 14:14:39 +02:00
Sam
cbca7e9f7e PC-540 
Fixed unneeded messages
 2016-06-17 12:06:56 +01:00
Sam
63c2f5c855 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-17 12:06:17 +01:00
TadahTech
d16f83af00 Attempt to fix duplicate messages bug. I cannot reproduce in testing. 2016-06-16 21:12:17 -05:00
cnr
16f6d75dea Revert kit name changes 
We can change this back whenever we've migrated to the new name in mssql
 2016-06-16 20:36:33 -05:00
TadahTech
3dc93e5c8f Fix rare GUI reported bug. 2016-06-16 19:46:31 -05:00
TadahTech
2e0965a064 Fix Infestor kit 
Fix rare occurrence of players getting a GUI they shouldn't (reported)
 2016-06-16 19:45:36 -05:00
TadahTech
e28d411ee4 Fix evolution not progression. 
Fixed incorrect description in Gladiators
Reformatted kits in Bridges
 2016-06-16 18:39:37 -05:00
Sam
a20ae6b58d PC-540 
Fixes an issue where players could lose water blocks in Speed builders.
 2016-06-17 00:31:32 +01:00
Sam
79085c1ecf PC-541 
Fixes an issue where glowing redstone ore would not be counted if the
expected block was redstone ore.
 2016-06-17 00:26:24 +01:00
Sam
3f62dd49ef Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-16 23:40:19 +01:00
Shaun Bennett
0873ee0116 Show entire booster queue in booster gui 2016-06-16 16:54:54 -05:00
samczsun
1893e98036
Don't run chat filtering on the main thread 2016-06-16 16:39:43 -04: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
TadahTech
5ac6249684 Fix Bridges Kits not getting their items. 
Fix Kits breaking at Level 5
 2016-06-16 15:34:23 -05:00
Shaun Bennett
ea551182b6 Make booster gui smaller 2016-06-16 15:29:05 -05:00
Sam
ce23a94f3f PC-550 
Fixes an issue where players would be able to interact with blocks on
other people's islands in Speed Builders
 2016-06-16 12:25:21 +01:00
Sam
1d3e12dfb6 PC-574 
Fixes an issue where staff in vanish would be placed in the game after
each round.
 2016-06-16 12:10:39 +01:00
Sam
c3a18813ee PC-555 
Fixes an issue where vanished players would show up in the "Give
Co-Host" and "Remove player" menus in MPS.
 2016-06-16 11:39:51 +01:00
Sam
9e75cc6224 Fixes incorrect item in OITQ 
Players should now get the stone sword that is intended with the leaper
kit, assuming it was some merge or pushing error.
 2016-06-16 11:12:16 +01:00
Thanos Paravantis
ce7bb82d67 Update blockBreakEffect and replace old methods 2016-06-16 12:48:28 +03:00
Thanos Paravantis
49fa3377fc Update Lava Run challenge 
This update includes bug fixes and improvements for Lava Run.

- Fixed obsidian staying in the map after the challenge has ended.
- Obsidian block now appears after the challenge has started,
so players cannot spot it before the challenge starts.
- Added block break particle when the obsidian changes position.
- Players can no longer be damaged from the lava
(damage is now disabled on all challenges when they end).
- Minor performance update.
 2016-06-16 12:37:31 +03:00
TadahTech
e7d76e2ef4 Hot fixes. 2016-06-16 03:56:32 -05:00
samczsun
d6d8d288ca
Prevent TNT duping in Bridges. Fixes PC-132 2016-06-15 22:10: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