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 30287a0832b8650d741d
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
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
Shaun Bennett
2f1954e41c
Rename to booster group
2016-06-15 18:18:09 -05:00
Shaun Bennett
cbfbd6fe1c
Booster GUI update
2016-06-15 17:40:20 -05:00
TadahTech
27afd3d96c
Kit progression update
2016-06-15 15:54:53 -05:00
Thanos Paravantis
e5cec9c976
Change min players on Treasure Digger back to 4
2016-06-14 14:44:43 +03:00
Thanos Paravantis
47a4e5d9a9
Make chickens attack with more accuracy
2016-06-14 14:41:56 +03:00
Shaun Bennett
aa785ed3d5
Code clean-up and documentation
2016-06-12 21:18:11 -05:00
TadahTech
22e22ff508
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-12 00:42:22 -05:00
xXVevzZXx
bf4de4471a
fix permanent item removal and battle items in inventory
2016-06-11 17:33:12 +02:00
xXVevzZXx
bc77605dcd
make crafted weapons in SG unbreakable
2016-06-11 16:43:56 +02:00
xXVevzZXx
a461e9cf1c
fix inventory being editable while voting phase
2016-06-11 16:27:31 +02:00
xXVevzZXx
75e36d0e08
fix pickup of dropped tnt
2016-06-11 16:13:07 +02:00
xXVevzZXx
5e551a2ba6
fix waller only being able to make two walls
2016-06-11 15:49:31 +02:00
Keir Nellyer
6bc8039dbd
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-11 14:04:43 +01:00
Keir Nellyer
ed50e09a6e
Fix issue an old un-closed but expired report may be re-opened and cause issues
2016-06-11 13:59:53 +01:00
Keir Nellyer
197acee4ae
Implement server weighting
2016-06-11 13:47:45 +01:00
Shaun Bennett
cf87469400
Fix a possible NPE, use proper IP and port for api
2016-06-10 20:24:22 -05:00
Shaun Bennett
2421fd1cfe
Update booster page, proper booster rewards
2016-06-10 19:40:27 -05:00
Shaun Bennett
42c35063b3
Display all the boosters you have activated
2016-06-10 17:40:59 -05:00
xXVevzZXx
73d8aec494
fix breakable Armor in Wizards
2016-06-11 00:21:04 +02:00
xXVevzZXx
b13b354ce7
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
2016-06-11 00:20:38 +02:00
Shaun Bennett
6964b1f266
Booster gui command
2016-06-10 17:20:23 -05:00
Shaun Bennett
e6920b4549
Work on booster gui, display wait time
2016-06-10 17:17:43 -05:00
Shaun Bennett
ceb4de8b35
Load booster groups for arcade
2016-06-10 16:33:53 -05:00
Thanos Paravantis
6d380c6c6f
Rename building champion to Speedy Builders
2016-06-10 22:44:13 +03:00
cnr
06cee364fc
Merge branch 'mopple' into develop
2016-06-10 14:12:07 -05:00
Shaun Bennett
0a204a3b90
Use redis pub/sub to send booster updates
2016-06-10 12:44:27 -05:00
Sam
739fcdc649
Fixes the problem where players could not fire a bow in OITQ
...
Users with high latency were not able to fire bows.
2016-06-10 16:29:27 +01:00
Keir Nellyer
a73e1c24b5
Properly calculate user reputation
2016-06-10 15:47:59 +01:00
Thanos Paravantis
f47d2abd87
Hide map quicker from players
2016-06-10 16:44:51 +03:00
Thanos Paravantis
f277e5ca9a
Fix diamond hunt map creation
2016-06-10 16:44:11 +03:00
Thanos Paravantis
1ed27e72a6
Use resetBlock method to set air blocks
2016-06-10 16:08:06 +03:00
Thanos Paravantis
5b021d3ecc
Update all challenges to use new set block method
2016-06-10 16:03:33 +03:00
Thanos Paravantis
00f14131df
Update treasure digger to use new set block method and apply minor improvements on chicken attack
2016-06-10 15:11:48 +03:00
Keir Nellyer
380139477c
Reduce expiry time for reports
2016-06-10 12:59:50 +01:00
Keir Nellyer
36f47b7067
Clear report cache when report is closed
2016-06-10 12:41:02 +01:00
Keir Nellyer
09009c352b
Remove new-line in query
2016-06-10 12:34:23 +01:00
Keir Nellyer
2cacdbae34
Use more robust Guava Cache class for caching
2016-06-10 12:33:46 +01:00
Thanos Paravantis
47c4e57ce4
Fix unexpected challenge end
2016-06-10 13:33:20 +03:00
Thanos Paravantis
52ce640391
Merge branch 'develop' into thanos-mineware
2016-06-10 12:15:54 +03:00
Thanos Paravantis
b08abf9a73
Apply zombie infection improvements (wip)
2016-06-10 12:13:01 +03:00
Shaun Bennett
e30cd6747b
Increase goal 10 million, probably need to change later
2016-06-09 23:40:58 -05:00
Shaun Bennett
1d365d726c
brawl fountain now displays proper info on the weekend
2016-06-09 23:40:58 -05:00
Shaun Bennett
08e47b4b1b
Enable tips in bonus gui
2016-06-09 22:41:41 -05:00
Shaun Bennett
8bf26dbc11
Use a better podium for NPC, reenable boosters
2016-06-09 18:57:48 -05:00
Keir Nellyer
4503f12738
Implement report caching
2016-06-10 00:28:07 +01:00
Shaun Bennett
35e1c2af65
Use rewardCoinsLater for giving shards
2016-06-09 18:19:22 -05:00
Keir Nellyer
22dbcbf90d
Move util method to sequence CompletableFuture's to new class 'UtilFuture'
2016-06-09 23:41:17 +01:00
Alex-The-Coder
77e9de0f8f
Update required rank in
...
fountain add help message
2016-06-09 17:02:00 -05:00
Alex-The-Coder
0306f1d703
Update required rank in
...
booster command help message
2016-06-09 17:02:00 -05:00
Alex-The-Coder
dbe8f39eeb
Update required rank in
...
add booster help message
2016-06-09 17:02:00 -05:00
Keir Nellyer
fe06fba406
Re-word from "hacking" to "guilty" so that button is applicable for both types of reports
2016-06-09 22:49:04 +01:00
Keir Nellyer
ad17c620b7
Fix sql query for fetching report result counts
2016-06-09 22:48:18 +01:00
xXVevzZXx
f6b60ad956
fix idle manager to persist teleports and make xp rewards depending on playtime
2016-06-09 15:51:27 -05:00
Keir Nellyer
e24d67ecd3
Report errors when fetching a ReportProfile and attempt to recover from it
2016-06-09 18:11:38 +01:00
Keir Nellyer
f0da319f46
Inventories must be handled on the main thread
2016-06-09 18:00:15 +01:00
Keir Nellyer
1db1257a05
Report message task for handler now checks if the report is still active
...
Due to recent changes, this no longer needs to run asynchronously as the CompletableFuture class already makes thing asynchronous for us.
2016-06-09 17:45:08 +01:00
Keir Nellyer
5d9a317f2a
Fix sql queries which use reserved words
2016-06-09 17:06:44 +01:00
Keir Nellyer
e113b0744d
Fix incorrect column name when getting report reasons
2016-06-09 17:06:09 +01:00
Keir Nellyer
9dbef26b92
Fix small typo in comment
2016-06-09 16:34:18 +01:00
Keir Nellyer
8e48b00264
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-09 15:16:38 +01:00
cnr
ba319599ba
Fix fountain schematic file paths
2016-06-09 01:18:09 -05:00
Shaun Bennett
91f6ddce55
Add some minor documentation
2016-06-09 00:48:44 -05:00
Shaun Bennett
611cb28d1a
Fix a typo
2016-06-09 00:47:03 -05:00
Shaun Bennett
cade7b4081
Remove got boosters message
2016-06-09 00:43:59 -05:00
Shaun Bennett
d6bce63967
Use schematics from update folder
2016-06-09 00:43:03 -05:00
Shaun Bennett
ece08c23a9
Fix merge issues
2016-06-09 00:40:05 -05:00
Shaun Bennett
699b35995f
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2016-06-09 00:39:39 -05:00
Shaun Bennett
d4ac309daa
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
2016-06-09 00:29:27 -05:00
Shaun Bennett
83be0d7efe
Disable game boosters in arcade
2016-06-09 00:28:48 -05:00
Shaun Bennett
85829d355d
Fix command permissions
2016-06-09 00:25:54 -05:00
Shaun Bennett
22bb56dfda
Remove game booster button
2016-06-09 00:22:54 -05:00
Shaun Bennett
09d2c00f66
Proper display of extra gem fountain rewards
2016-06-09 00:14:01 -05:00
cnr
cf6e3cf05d
Merge branch 'feature/game-variants' into develop
2016-06-08 22:47:16 -05:00
Shaun Bennett
c9d5b91c52
Proper booster activation events
2016-06-08 19:22:25 -05:00
xXVevzZXx
ce8c8543f6
fix game class not beeing added to modable classes
2016-06-09 01:11:19 +02:00
xXVevzZXx
b66b459e05
implement xp multiplier
2016-06-08 23:40:48 +02:00
cnr
d54bed150e
Merge branch 'mopple' into develop
2016-06-08 12:59:06 -05:00
xXVevzZXx
1aba217c55
slowly increase spider energy
2016-06-08 12:51:07 -05:00
xXVevzZXx
aa1c599b5e
Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM
2016-06-08 12:51:07 -05:00
Shaun Bennett
37a412f1bf
Starting to merge boosters into arcade code
2016-06-07 17:24:24 -05:00
AlexTheCoder
4f00c72d8c
Fix bad autocomplete
2016-06-07 03:58:58 -04:00
xXVevzZXx
9e88174c36
slowly increase spider energy
2016-06-07 00:19:56 +02:00
Sam
7da009d133
Revert "Space in front of disguised player's names when rank = all"
...
This reverts commit 3bcfe22835
2016-06-06 21:10:51 +01:00
Sam
3bcfe22835
Space in front of disguised player's names when rank = all
...
Fixes a small problem where there would be a space in front of a user's
name if they were disguised as a player with a rank of ALL.
2016-06-06 21:06:40 +01:00
Sam
298c09ab82
Lowercase rank prefixes in tablist when in party
...
When in a party the rank prefix in the tablist of every user is now
uppercase.
2016-06-06 20:45:07 +01:00
Sam
8066eb939a
PC-500
...
Fixes an issue where players were able to open beacon inventories can
give themselves the buffs from it.
2016-06-06 18:14:06 +01:00
Thanos Paravantis
7288c4f131
Fix landing detection on cloud fall and improve clouds
2016-06-06 19:40:54 +03:00
TadahTech
474a9dc975
Heavy UI and Command work. Begin testing
...
Time: 2hrs
2016-06-05 23:37:08 -05:00
TadahTech
c577e5827c
Heavy UI and Command progress.
...
Time: 4hrs
2016-06-05 22:55:06 -05:00
TadahTech
a9c086172f
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-05 19:06:15 -05:00
TadahTech
ee35dd3442
Redis system implementation and code refactoring.
...
Total time: 13hr
2016-06-05 19:05:29 -05:00
Sam
4b576dbf3c
PC-164
...
Fixes an issue where players would be able to duplicate items in Bridges
2016-06-05 23:03:04 +01: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
Thanos Paravantis
b9a6fdee24
Fix dragon eggs not disappearing after challenge end
2016-06-05 20:13:32 +03:00
Sam
64ff9f193a
PC-403
...
Fixes an issue where if a player was in the respawning state in MCL and
their tower was destroyed they would not receive their gold armor
2016-06-05 15:34:20 +01:00
Sam
2755543686
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-05 15:32:06 +01:00
TadahTech
502111ef4e
Redis system needs a shit ton of work. Need to design it better.
2016-06-05 00:42:22 -05:00
TadahTech
4ce9c90839
Party Redis init.
...
Wrap for 6/4/2016. Total time: 9.3 hrs.
2016-06-05 00:32:04 -05:00
TadahTech
8c3d5f66a2
UI work.
2016-06-05 00:03:01 -05:00
TadahTech
d1fb547d09
Files changed that need to be edited later on with the new Party System.
...
Memory commit
2016-06-04 23:02:02 -05:00
TadahTech
e7f4f00433
Files changed that need to be edited later on with the new Party System.
...
Memory commit
2016-06-04 22:56:30 -05:00
cnr
8de5280241
Disable /allowCmd
2016-06-04 22:55:15 -05: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
TadahTech
bccc11eeaf
Files changed that need to be edited later on with the new Party System.
...
Memory commit
2016-06-04 22:41:01 -05:00
TadahTech
84f428fa99
Redis work: Command work: UI work:
...
Total Time: 2.5hrs
2016-06-04 21:13:19 -05:00
AlexTheCoder
f658506e41
Make freezing smoother, implement simple debugging, fix scoring, make bounds smoother, fix 3 pointer determination, and fix description of kit
2016-06-04 20:57:17 -04:00
Ben
1778bd4c28
Final little tweaks to Champions
2016-06-04 18:28:38 +01:00
Sam
05e85523b1
PC-405
...
Fixes an issue where players would be able to fill buckets of water in
Bridges and get to the centre before the Bridges has fallen.
2016-06-04 17:42:30 +01:00
Sam
78c5b8a0a3
PC-402
...
Fixes a typo with the BeastMaster kit.
2016-06-04 17:00:09 +01:00
TadahTech
22a438d5c1
Party system rewrite init. Barebones frame work: Total time - 2hrs.
2016-06-04 01:54:17 -05:00
Sam
981943b38b
PC-413
...
Fixes an issue where /vanish could be abused during GameState.Prepare
2016-06-04 00:14:12 +01:00
Sam
f99d4bc14d
PC-164
...
Fixes an issue where players would be able to duplicate kit items by
giving them to another player then using their "Early game revive"
2016-06-03 23:29:46 +01:00
xXVevzZXx
5a5a25a799
make "and" bold
2016-06-03 14:15:46 +02:00
Sam
c01b6da390
Staff is incognito could be found using /stats (PC-Bugs-407)
...
Fixes an issue where players could do /stats <name> to find out if
vanished players were on their server.
2016-06-03 13:14:54 +01:00
Sam
1ff06adf18
Rewrite of how /vanish is handled in game servers (PC-Bug-413)
...
Fixes all /vanish based issues where players would be not correctly
handled while toggling /vanish in game servers.
2016-06-03 13:13:19 +01:00
xXVevzZXx
f517954064
edit gem/shard display layout
2016-06-03 14:12:55 +02: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
Sam
ee10751e23
Players could flip trap doors (PC-Bugs-440)
...
Fixes an issue where players would be able to flip trap doors in Dragon
Escape to either troll players or give them an advantage.
2016-06-02 22:30:18 +01:00
Sam
b51007da91
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-02 22:28:35 +01:00
LCastr0
b3291476cb
Changed method names
...
Changed kit modifiers to be in an enum instead of creating a new class for each modifier
Implemented kit modifiers in the games
Removed renaming from Widder, Christmas Elf and Pumpling
Changed the persistence to have the system that Connor added
2016-06-02 18:25:16 -03:00
xXVevzZXx
719ac114d8
change text color
2016-06-02 21:19:54 +02:00
xXVevzZXx
231b55d018
add shards depending on rank
2016-06-02 21:13:12 +02:00
Thanos Paravantis
c1bd25cdbe
Merge branch 'develop' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-06-02 22:06:59 +03:00
Thanos Paravantis
f86a430266
Use disguisePlayers() and remove clone() method
2016-06-02 22:04:52 +03:00
Thanos Paravantis
daf0247d2d
Add brackets to statements
2016-06-02 22:04:00 +03:00
Thanos Paravantis
656c713132
Elevate egg smash score hologram
2016-06-02 22:03:15 +03:00
xXVevzZXx
aa1ea63337
adding shard reward to games
2016-06-02 20:16:36 +02:00
cnr
894b7db18e
Remove remaining fake ultra tag artifacts
2016-06-02 02:25:15 -05:00
Sam
eaada4acaf
PC-400
...
Fixes an issue where items could be placed in item frames and then would
not be able to be retrieved.
2016-06-01 23:40:03 +01:00
Sam
6a423b571a
PC-379
...
Fixes an issue where the map selector for Paintball and Snow Fight did
not work in MPS.
2016-06-01 22:40:07 +01:00
Sam
e6ab50c5b3
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-01 22:04:13 +01:00
Sam
146f878e62
PC-422
...
Fixes a not well constructed kit description. (Medic)
2016-06-01 22:03:13 +01:00
Sam
d83a6cd95c
PC-421
...
Fixes a typo when a user was reported for an inappropriate build.
"Buildres" to "Builders"
2016-06-01 21:57:34 +01:00
samczsun
f7adf731a9
Delete query command
2016-06-01 16:17:17 -04:00
Keir Nellyer
9465ab40ab
Fix sql query for fetching name of user account
2016-06-01 16:51:22 +01:00
Sam
936eb1b978
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-01 15:41:22 +01:00
Sam
b08c2c9467
PC-149
...
Fixes an issue where entities wouldn't be removed when a build got a
"Failure" score.
2016-06-01 15:41:02 +01:00
Sam
4c4363ffaa
PC-409 - 2
...
Not sure why but it missed out an if statement in the previous commit
2016-06-01 14:54:23 +01:00
Sam
df9fe45d7e
PC-409
...
Fixes an issue where the game lobby scoreboard would not account for
players in /vanish.
2016-06-01 14:51:22 +01:00
cnr
25a315ac05
Revert "Clans optimizations"
...
This reverts commit 89da8790bf
2016-06-01 00:58:58 -05:00
cnr
750120c106
Prevent developers from using /punish
2016-06-01 00:47:22 -05:00
cnr
84853a1f9a
Revert "Update chat-spam message with coupon link"
...
This reverts commit dfbb4dca11
2016-06-01 00:39:44 -05:00
cnr
825839d853
Fix PlayerKeyValueRepository's exception and return types
2016-06-01 00:38:29 -05:00
Sam
1a9f58451b
PC-383
...
Fixes the issue where players would not be able to move when joining a
game in Mine-Strike as the GetSpectatorLocation() method would be
outside the map borders.
2016-05-31 22:35:52 +01:00
xGamingDudex
1141a05310
Add setReviewed method to build repository
2016-05-31 22:18:40 +02:00
xGamingDudex
99027258ee
Added selection method for review queue.
2016-05-31 21:49:56 +02:00
xGamingDudex
22bf3bfd03
Removed create table on startup to follow DB policies
2016-05-31 21:19:34 +02:00
Sam
6b70292837
PC-124
...
Fixes an issue where if a user did /spec pre-game they would not be
given a Spell-Book in game.
2016-05-31 20:04:03 +01:00
Sam
d98afaf829
PC-125
...
Fixes a small grammatical error where "effect" was used instead of
"affect".
2016-05-31 19:44:29 +01:00
Sam
6cb275e036
PC-121
...
Changed 'a' to 'an' in the text component of the friend menu
2016-05-31 14:44:18 +01:00
Sam
6a2b43f32d
PC-130
...
Fixes an issue where you could right click the UHC item in the set game
page which would allow you to have a golden apple in game.
2016-05-31 14:15:19 +01:00
Sam
c7757117fc
PC-148
...
Fixes a very trivial issue with Ocelots being named incorrectly
2016-05-31 13:40:20 +01:00
Sam
3bdc541c9d
Debug message removal
2016-05-31 11:12:55 +01:00
AlexTheCoder
25da5fc132
Format the game to work with the map
2016-05-30 23:58:22 -04:00
Sam
6db4c3acc7
PC-203
...
Fixes the issue of "auto-bowing" in OITQ
2016-05-31 01:46:50 +01:00
Sam
55317730fa
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-05-30 23:21:38 +01:00
Sam
cb2dd508bd
PC-413 (Fixed)
...
Fixed some aggressive auto-formatting
2016-05-30 23:21:20 +01:00
Sam
4a0558d5c8
PC-413
...
If staff join any game normally with /vanish disabled, then vanish
before the game starts, you still participate in the game except you're
invisible to everyone.
2016-05-30 23:11:19 +01:00
Alex-The-Coder
abb2729c0e
Remove arcade logitech advertisement
2016-05-30 14:46:29 -04:00
Alex-The-Coder
ff415a4569
Remove hub logitech advertisement
2016-05-30 14:44:07 -04:00
Shaun Bennett
4e9a48ab4f
Finish off the tip system
2016-05-30 12:02:12 -05:00
xXVevzZXx
365dd0e561
Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM
2016-05-30 14:44:42 +02:00
Thanos Paravantis
b258ec69ac
Update Deadly TNT and remove Fishing Day
...
Deadly TNT was updated in order to display a cooldown bar until
the next TNT throw, just above the player's inventory.
Fishing Day was removed from rotation as requested.
2016-05-30 14:54:10 +03:00
Thanos Paravantis
e77bee5cd8
Implement building champion, remove quick climber and enhance chicken attack
...
Building Champion achievement was implemented as a replacement
for quick climber achievement, since quick climber is almost impossible
to complete in public games. Build Champion is based on Build Race challenge,
and it requires players to place all blocks in their inventory,
within 15 seconds. Moreover, chicken minions can now attack players,
even if they are stuck in the water.
2016-05-30 12:51:58 +03:00
Thanos Paravantis
76f161f9ed
Update Zombie Infection and Zombie Wrapper
2016-05-30 12:48:07 +03:00
Thanos Paravantis
a918f9067d
Add double plant generation and fix life reduction bug
2016-05-30 12:46:04 +03:00
Thanos Paravantis
8ee53c935b
Use getPlayersWithRemainingLives() on map creation
...
The getPlayersAlive().size() has been replaced with
getPlayersWithRemainingLives(), since during map generation
players have not been reset yet. With that, all players are
selected properly.
2016-05-30 12:43:35 +03:00
Thanos Paravantis
d11c3c76eb
Add chicken attack info message
...
Every time chicken attack is triggered for a player, a chat message will
be displayed that explains why the player is being attacked by chickens.
Also, two debug messages were removed, since they were no longer used.
2016-05-30 12:39:17 +03:00
Shaun Bennett
e380354bad
Refactor CurrencyType
2016-05-29 16:34:21 -05:00
Keir Nellyer
01855ba1ce
Some small changes to the reporting system after some very shallow
...
initial testing has been done
Improve exception handling (so we actually get a stacktrace if
something goes wrong).
Check if users can report before showing the category gui.
Tell user if the report failed (due to some sort of internal error).
Correctly get the id of a report when inserting into the database for
the first time.
Shorten some lambdas by using method references.
Remove some unused imports.
Small variable name changes.
2016-05-29 02:45:24 +01:00
Keir Nellyer
55392eae97
No need for 'this' keyword here
2016-05-29 01:10:42 +01:00
Keir Nellyer
075c2d21e9
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-05-29 00:27:48 +01:00
Keir Nellyer
20038f9e64
Massive changes made to how the report feature functions
...
Re-enabled report feature (merge from develop disabled it).
Moved reports from Redis to MySQL.
Made everything asynchronous.
Many many other miscellaneous changes.
Bugs will now be worked out and then this should be ready for QA testing
2016-05-29 00:25:26 +01:00
Shaun Bennett
a1437a3044
Starting to add gui logic
2016-05-28 11:23:26 -07:00
Shaun Bennett
aebcfc2727
Booster tip system
2016-05-28 09:21:10 -07:00
Shaun Bennett
e00009a6d1
Fix CustomTagFix applying to holograms under certain conditions
2016-05-28 09:20:33 -07:00
Shaun Bennett
4bbf39ca1c
Update JOOQ files
2016-05-28 08:59:03 -07:00
xGamingDudex
4fc3c491f8
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders
2016-05-28 02:04:27 +02:00
xGamingDudex
31a941e1c0
Changed repository to upload schematic data instead of test data
2016-05-28 01:32:32 +02:00
xGamingDudex
02863d4a6a
Updated some of the Mavericks reposetory to use place instead of won
...
This also implements a small schematic tester inside the Mavericks Game.
Converted some NautHashMaps into regular HashMaps
2016-05-28 01:23:14 +02:00
xGamingDudex
1d20e84107
Fixed support for Entities and TileEntities for schematics
...
Fixed some NBT tools
Added and tested schematic support for entities and tile entities
All conversion and creations for schematics should now also be fixed. So
creating schematics from two points inside a world. Converting
schematics to bytes and converting bytes to schematics.
2016-05-28 01:21:11 +02:00
cnr
dfbb4dca11
Update chat-spam message with coupon link
2016-05-27 13:18:07 -05:00
Sam Sun
59c26bdcd7
Undo leap change
2016-05-27 13:41:49 -04:00
Ben
5899933d8d
[Mage/LifeBonds] Make health be taken from your own rather than the nearest player with highest health. [PC-350]
2016-05-27 13:46:06 +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
f1f464f3a4
Change listener priority again. Fixes PC-209
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
Keir Nellyer
ad486a7e22
Merge remote-tracking branch 'origin/develop' into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportCategory.java
2016-05-26 13:24:24 +01:00
xGamingDudex
806fa7fca4
Added MavericksRepository (+ forgot schematic data in last commit)
...
+Tweaked some MasterBuilders code
2016-05-26 01:19:05 +02:00
xGamingDudex
7a0eea7aa0
Added better saving and loading methods to Schematics
...
Added some extra NBT utils
Added support for TileEntities and Entities to schematics
2016-05-26 01:17:19 +02:00
cnr
1c66c10293
Don't create backing tables on startup
2016-05-25 17:59:21 -05:00
cnr
5331e2bec9
Allow PlayerKeyValueRepository Exceptions to propagate
2016-05-25 17:59:20 -05:00
xGamingDudex
8a2c30fa84
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders
2016-05-26 00:06:23 +02:00
LCastr0
e52ff13712
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-25 12:20:18 -03:00
LCastr0
460cb08f54
Adds old gadget names
...
Adds another fix for winroom speed
Moves gadgets to individual packages, easier to manage in a future update
Adds gadget persistence (Or maybe not)
Changed mount locked item data to 8 instead of 7
2016-05-25 12:19:06 -03:00
cnr
857cf6ad30
Add PlayerKeyValueRepository and BukkitFuture
...
PlayerKeyValueRepository<V> is a key/value store whose keys are Strings
and whose value type is parameterized by V. Each repository is backed by
a MySQL table in the Accounts database.
Access to PlayerKeyValueRepository's values is restricted via
CompletableFuture to enforce async database access.
BukkitFuture contains helpful utilities for producing, transforming, and
terminating CompletableFutures with actions on the main thread. A
typical PlayerKeyValueRepository action may look similar to the
following, where we retrieve all key/value pairs for a player and
perform an action with the result on the main thread:
PlayerKeyValueRepository<String> repo = [...]; // init repo
UUID uuid = [...]; // a player's UUID
repo.getAll(uuid).thenCompose(BukkitFuture.accept(values -> {
// this will be run on the main thread!
// `values` is of type `Map<String,String>`
}));
2016-05-25 08:35:05 -05:00
AlexTheCoder
ba1eeedf93
Implement scoreboard display and handle parsing of map information
2016-05-25 01:59:48 -04:00
AlexTheCoder
e0960c8705
Finish fleshing out api methods and game structure, and implement dynamic scoring manager
2016-05-24 18:30:20 -04:00
samczsun
9da9dce398
Fix mimic, allow chests and invite. Fixes PC-375
2016-05-24 16:40:25 -04:00
samczsun
2991bec44d
Fix listener priorities (again). Fixes PC-370
2016-05-24 16:04:15 -04:00
samczsun
2680c2b244
Don't apply attributes on friendlies. Fixes PC-369
2016-05-24 15:58:44 -04:00
samczsun
9af2c7e9f4
Restore hunger after Hold. Fixes PC-334
2016-05-24 15:38:18 -04:00
samczsun
9acdbd7cbe
Don't allow placing banners and string. Fixes PC-333
2016-05-24 15:38:03 -04:00
Sam Sun
9853ef824e
QA Pass #2 - Comment WorldManager, optimize searching
2016-05-24 12:24:14 -05:00
AlexTheCoder
b952de856e
Add a description for the Magnetic Maul and switch ConcurrentHashMap to HashMap in the Meridian Scepter
2016-05-24 13:15:29 -04:00
samczsun
f32e648691
QA Pass #1
...
Remove potential main thread IO in ItemMapManager
Don't construct search string if limit is reached
Also cleaned up WorldManager to be more efficient
2016-05-24 13:15:29 -04:00
samczsun
2f993dbe66
Fix Wind Blade, Hyper Axe
2016-05-24 13:15:29 -04:00
samczsun
4ba3148df7
Finish invsee
2016-05-24 13:15:29 -04:00
samczsun
ec0e1b9849
New invsee implementation
2016-05-24 13:15:29 -04:00
samczsun
63e3cc8e12
Add nullcheck
2016-05-24 13:15:29 -04:00
samczsun
d8b5dba3fc
Fix Meridian Scepter
2016-05-24 13:15:29 -04:00
AlexTheCoder
1dc5a0d712
Revamped Meridian Scepter attack
2016-05-24 13:15:29 -04:00
samczsun
516ad5a640
Check cancellation before continuing Takedown. Fixes PC-277
2016-05-24 13:15:29 -04:00
samczsun
72a2aa926f
Change event priority again. Fixes PC-216
2016-05-24 13:15:29 -04:00
samczsun
981bed5e37
Limit clan searching. Fixes PC-331
2016-05-24 13:15:29 -04:00
samczsun
e0f4c9cbc8
Update Broadsword regen
2016-05-24 13:15:29 -04:00
samczsun
14c60ec3ba
Delay recall by one tick. Fixes PC-328
2016-05-24 13:15:29 -04:00
samczsun
51c9301799
Consider leap level. Fixes PC-330
2016-05-24 13:15:29 -04:00
samczsun
41846f835d
Bump listener priority, change wording. Fixes PC-308
2016-05-24 13:15:29 -04:00
samczsun
c172d226c4
Add bypass for testing servers to skip tutorials
2016-05-24 13:15:29 -04:00
samczsun
08784d3f0a
Ignore float kick for Wind Blade. Fixes PC-314
2016-05-24 13:15:29 -04:00
samczsun
786c60537e
Remove /c trust from help. Fixes PC-280
2016-05-24 13:15:29 -04:00
Sam Sun
cd0e59087a
Don't drop items from hidden slimes. Fixes PC-276
2016-05-24 13:15:29 -04:00
samczsun
9141ed645a
Fix fissure anvil repair exploit. Fixes PC-312
2016-05-24 13:15:29 -04:00
samczsun
ea43dca9af
Don't allow placing TNT in tutorial. Fixes PC-307
2016-05-24 13:15:29 -04:00
samczsun
d29d5dd5e4
Actually fix PC-279
2016-05-24 13:15:29 -04:00
samczsun
89da8790bf
Clans optimizations
...
Key notes:
* RAM usage decreased on startup
* Startup speed much quicker
* Map is entirely rendered on startup
Details:
Changed TutorialWorldManager Stack -> LinkedList because no need for
synchronization
Documented map methods and magic numbers
Remove loading all chunks on startup
Render map on startup
Optimize map rendering by replacing ArrayList with LinkedList
Optimize map rendering by reading chunk directly from disk and caching to
prevent entity ticking
Optimize map rendering by using a global BlockPosition
Save results for showing zoom
2016-05-24 13:15:29 -04:00
samczsun
7c66c98338
Clean up Farming
2016-05-24 13:15:29 -04:00
samczsun
173a6bb143
Delete IncognitoHidePlayerEvent
2016-05-24 13:15:29 -04:00
samczsun
2675789f59
Compare commands with equals. Fixes PC-116
2016-05-24 13:15:29 -04:00
xGamingDudex
f550df5a4b
Initial game commit.
2016-05-24 13:31:59 +02:00
Ben
1e0b94d870
[BlockHunt,Wizards,Champions] Disable particle effects [PC-156]
2016-05-24 12:08:18 +01:00
Ben
bad9077144
[Ranger/VitalitySpores] Change to if you take damage and then go 10 Seconds without taking more damage, you will receive Regen 2 for 6(+1 pl) Seconds; if you take damage during that regen you lose it [PC-354]
2016-05-24 11:09:05 +01:00
Shaun Bennett
434ada2e86
Fix merge issues
2016-05-24 19:14:52 +10:00
Shaun Bennett
1377e6724f
Merge with develop
2016-05-24 19:10:55 +10:00
Shaun Bennett
b6376cae2f
Remove googles http api (no longer needed) and add apache http to core.common
2016-05-24 17:23:17 +10:00
Shaun Bennett
12c5ba80b7
API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation
2016-05-24 17:13:33 +10:00
Ben
bc3ec4088a
[Ranger/Sharpshooter] Missing two shots causes the damage bonus to reset. [PC-352]
2016-05-24 01:16:11 +01:00
Ben
5791cc5dec
[Assassin/Evade] Buff the skill in multiple ways [PC-355]
2016-05-24 01:15:29 +01:00
Ben
8bb9811a80
[Assassin/Blink] When de-blinking set the rotation of the player to the rotation that was present at the time of the de-blinking rather than the rotation of the player when they blinked. [PC-359]
2016-05-24 00:28:48 +01:00
Ben
243044b921
[Skill/Assassin] Remove Rest & Fitness from. [PC-358 AND PC-357]
2016-05-24 00:25:32 +01:00
Ben
5448c42e45
[Assassin/Recall] Don't allow use when in water [PC-360]
2016-05-23 23:46:33 +01:00
Ben
609aa5177a
[Ranger/WolfsPounce] Lower damage [PC-353]
2016-05-23 23:45:42 +01:00
Ben
8da4ac3135
[Brute/FleshHook] Deal more damage/pull velocity when charging up more [PC-340]
2016-05-23 23:42:12 +01:00
cnr
494eafb97f
Use file.mineplex.com for resource packs
2016-05-23 07:52:22 -05:00
LCastr0
3ad7fc5f21
Adds old Mr.Punchman name
...
Adds another fix for winroom speed
2016-05-22 21:46:22 -03:00
Ben
e5b8636298
[Mage/Immolate] Do not allow use whilst in water [PC-351]
2016-05-23 01:23:08 +01:00
Ben
d019d27d23
[Mage/Blizzard] Increase energy usage. [PC-347]
2016-05-23 01:22:39 +01:00
Ben
af2eef5afe
[Mage/Inferno] Increase energy usage [PC-348]
2016-05-23 01:22:15 +01:00
Ben
02dc9ca3f9
[Brute/DwarfToss] Fix the water check being in the wrong location [PC-336]
2016-05-23 01:21:47 +01:00
LCastr0
ed68ef332b
Fixes for Win Room (Players were able to see other players)
...
Added command to allow other players to run ranked commands
Fixes code styles
2016-05-22 21:05:48 -03:00
Ben
48e998f630
[Knight/HiltSmash] Lower damage (previous commit for this ticket for some reason did not contain the lowered damage) [PC-343]
2016-05-23 01:01:27 +01:00
Ben
d8a3ebc704
[Knight/AxeThrow] Lower damage and increase recharge time. [PC-345]
2016-05-23 00:59:11 +01:00
Ben
2138330c70
[Brute/DwarfToss] Move Invulnerability condition appliance outside of the 5 tick delay as that allowed players to get attacked right after being thrown. [PC-336]
2016-05-23 00:57:46 +01:00
Ben
be007cd62f
[Knight/Swordsmanship] Change my previous commit for this skill a little bit, as it was clarified to be slightly different than I understood it to be. [PC-341]
2016-05-22 20:52:34 +01:00
Ben
ceab00f979
[Brute/BlockToss] Change recharge time and remove redundant null check. [PC-338]
2016-05-22 20:51:22 +01:00
xXVevzZXx
c984bbfc8a
make it possible to add stats to the brawl games
2016-05-22 00:29:58 +02:00
LCastr0
92b6abc884
Fixes merging bugs
2016-05-20 23:53:27 -03:00
LCastr0
0109e2f2dd
Fixes for Illuminated chest
...
Fixes for /check command (Support)
2016-05-20 23:33:58 -03:00
Ben
e701e0c0db
[Mage/IcePrison] Lower the per level lasting time of ice. [PC-349]
2016-05-21 00:46:57 +01:00
Ben
383f9005e1
[Mage/MagmaBlade] Lower damage [PC-346]
2016-05-21 00:44:16 +01:00
Ben
b1933eddc7
[Brute/BlockToss] Increase recharge time and fix the held block hitbox blocking the holder from getting attacked. [PC-338]
2016-05-21 00:22:57 +01:00
xXVevzZXx
f5d0f5209e
decrease bridge fall time and instant kill on map leave in op bridges and disable health regain in gladiators champions after poison is active
2016-05-21 00:29:04 +02:00
xXVevzZXx
28901f378a
fix up speed bridges item give out
2016-05-20 23:27:49 +02:00
xXVevzZXx
0fb84e57c1
Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2016-05-20 23:26:54 +02:00
Thanos Paravantis
d1f94bcba5
Apply minor changes to block lobbers challenge
2016-05-20 23:12:23 +03:00
Thanos Paravantis
e45134f8d5
Fix treasure digger map creation
2016-05-20 20:39:14 +03:00
Ben
55b0ed8eb5
[Knight/HiltSmash] Change base damage from 3 to 2 [PC-343]
2016-05-20 15:50:33 +01:00
Ben
8ba2132f81
[Knight/Swordsmanship] Buff base from 1 charge to 2 charges. [PC-341]
2016-05-20 15:49:57 +01:00
Ben
07c5e16e44
[Brute/Intimidation] Update lore to match the new damage distance [PC-337]
2016-05-20 15:07:57 +01:00
Thanos Paravantis
c828d37189
Rename InfestationZombie to ZombieWrapper
2016-05-20 13:34:21 +03:00
Thanos Paravantis
1dffc9b78e
Modify hologram height gain
2016-05-20 13:26:38 +03:00
Thanos Paravantis
745198d59e
Refactor punch the pig challenge
2016-05-20 13:25:30 +03:00
Ben
0883937316
[Knight/Riposte] Change base recharge from 10s to 14s [PC-342]
2016-05-20 11:06:23 +01:00
Ben
6020881af2
[Brute/CripplingBlow] Change knockback modifier from -50% to -25% [PC-339]
2016-05-20 11:03:15 +01:00
Ben
9154848ed9
[Brute/FleshHook] Lower base damage. [PC-340]
2016-05-20 10:23:45 +01:00
Ben
53fcab596a
[Brute/Intimidation] Lower range boost per level. [PC-337]
2016-05-20 10:17:59 +01:00
cnr
6b7cfd3eaa
Merge branch 'develop' into project-cosmetics
2016-05-20 03:23:46 -05:00
cnr
d6750c7d91
Disable /unlockCosmetics on production servers
2016-05-20 03:23:27 -05:00
LCastr0
22fb507871
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-20 05:14:29 -03:00
LCastr0
c58e0f3e30
Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics)
2016-05-20 05:11:59 -03:00
Shaun Bennett
efb264dd75
Hook into Booster API
2016-05-20 16:58:58 +10:00
xXVevzZXx
ef164091b8
make small Adjustments to gamemodes, make a fix for Absorbtion hearts and fix format
2016-05-20 02:39:19 +02:00
Ben
d52262c3fc
(Dwarf Toss) Add short invincibility for thrown players. Don't allow use in water. [PC-336]
2016-05-20 01:25:02 +01:00
Ben
dc7ea4e9c7
Brute Takedown skill nerf [PC-335]
2016-05-20 01:09:46 +01:00
cnr
f76b3f7d70
Freeze players when preparing for Master Builders. Fixes PC-127
...
This prevents players from quickly flying to other players' areas before
the game starts.
2016-05-19 18:02:46 -05:00
cnr
4351f6f1f0
Prevent muted MPS (co-)hosts from using /bc. Fixes PC-113
2016-05-19 18:02:46 -05:00
cnr
2ae6859e65
Apply slowness to Infiltrators in enemy spawn area. Fixes PC-185
2016-05-19 18:01:44 -05:00
cnr
419bf2a755
Fix mining drops in Bridges. Fixes PC-133
...
This change prevents players from using inadequate tools to mine ores,
e.g., using a stone pickaxe or fists to mine diamond ore.
2016-05-19 18:01:27 -05:00
AlexTheCoder
14a0ff8334
Add in data loc system
2016-05-19 16:28:14 -04:00
Thanos Paravantis
28f1d45b1c
Update achievement category game enum
2016-05-19 20:55:22 +03:00
Thanos Paravantis
472d3881a0
Merge branch 'develop' into thanos-mineware
2016-05-19 20:49:45 +03:00
Thanos Paravantis
87c8c7efa4
Merge branch 'master' into thanos-mineware
2016-05-19 20:42:43 +03:00
Thanos Paravantis
7e40141794
Fix spectators being teleported to map center
2016-05-19 20:40:13 +03:00
cnr
7f44281441
Merge branch 'develop' into project-cosmetics
2016-05-19 10:04:19 -05:00
cnr
18daf45298
Prevent wither assault spectators from reviving teammates.
...
This is a fix in the same vein as PC-103 (c7970d1
2016-05-19 09:51:21 -05:00
Shaun Bennett
012edfed45
Use loaded schematics to display fountain progress
2016-05-18 18:04:21 +10:00
Shaun Bennett
8d7ef7cc9a
Fix UtilBlock setting ghost blocks
2016-05-18 18:03:54 +10:00
LCastr0
11db05b6bf
Fixes spelling of MineStrike gun
...
Fixes spectators not being sent to the
winroom
2016-05-18 03:58:50 -03:00
Shaun Bennett
e3833b95ad
Update Gem Fountain purchase gui
2016-05-18 15:59:04 +10:00
TadahTech
3479d6e318
Fix incognito.
2016-05-17 18:12:05 -05:00
TadahTech
38a0b593ee
Fix height for 1.9 and 1.8 users.
...
*Thanks QA for not fully testing*....
2016-05-17 18:11:28 -05:00
TadahTech
51fd23ff84
Patch Bomber dupe glitch in Bridges in a better fashion.
...
Fix MCL Head Hunter achievement.
2016-05-17 18:11:11 -05:00
Ben
35c7b9a2bd
Incognito Updates:
...
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
Ben
8a75a5098c
Remove hub invisibility preference for all but Admins and higher.
2016-05-17 18:08:01 -05:00
Ben
014ce137fc
If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this.
2016-05-17 18:03:18 -05:00
Ben
6760c07e6c
Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa.
2016-05-17 18:00:20 -05:00
AlexTheCoder
141cafcf28
Implement initial game code and add skeleton for full play
2016-05-17 17:29:23 -04:00
xXVevzZXx
6e9b0e4fa5
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
2016-05-17 14:41:17 +02:00
cnr
6042be2d2f
Refactor clans ban functionality and remove UtilStreams
2016-05-17 05:57:27 -05:00
cnr
f5cf751622
Revert "Temporarily disable clans ban functionality"
...
This reverts commit b47c49d93b
2016-05-17 05:51:18 -05:00
TadahTech
43cadf564e
Fix Carl the Creeper. Fix Bridges TNT exploit.
2016-05-16 22:03:27 -05:00
samczsun
1fc4239b89
Determine whether Ice Prison target is valid. Fixes PC-281
2016-05-16 15:44:22 -05:00
Alex-The-Coder
1497662b2e
Restrict help display for main Game Command
2016-05-16 03:16:26 -04:00
William Burns
4633b99ad4
Don't block QA from testing, whoops.
2016-05-16 08:07:42 +01:00
LCastr0
fb63b3a1a4
Fixes for winroom command, and illuminated chest
2016-05-15 22:49:10 -03:00
LCastr0
42eef838b3
Fixes podium not being enabled by default
2016-05-15 21:33:36 -03:00
xGamingDudex
a27a618b2f
Made debugging tools only available on test servers
2016-05-16 02:04:15 +02:00
xGamingDudex
816a7ca232
Re-Activated chest buttons
2016-05-16 01:57:58 +02:00
xGamingDudex
d92ad9c53f
Made illuminated chest purchasable and added appropriate lore
2016-05-16 01:51:40 +02:00
LCastr0
511726f72a
Treasure chest coin checker for test servers
2016-05-15 20:43:46 -03:00
xGamingDudex
4ebf48bd45
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-16 01:34:08 +02:00
xGamingDudex
8ad7646128
Edits to treasure chests
2016-05-16 01:33:54 +02:00
xGamingDudex
f8d5bd3c11
Fixed treasure chests
...
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
2016-05-16 00:51:33 +02:00
LCastr0
09b7fbdbbe
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-15 18:48:00 -03:00
LCastr0
4f79ec6551
Pinata fixes
2016-05-15 18:47:09 -03:00
xGamingDudex
b4aad690e5
Fixed some rewards and added party trail to chests
2016-05-15 23:31:10 +02:00
xGamingDudex
fdf167953f
Fixed emerald set order
2016-05-15 23:30:17 +02:00
xGamingDudex
ca556f7846
Fixed win room would not sort player properly for solo games
2016-05-15 23:29:58 +02:00
xGamingDudex
7073ba4e6a
Fixed gadgets in the win room
2016-05-15 23:29:24 +02:00
xGamingDudex
1e6dda2d7d
Cleaned up some win effect backend code & fixed kits working in winroom
2016-05-15 23:28:12 +02:00
xGamingDudex
14f7e64a77
Fixed Animator and removed duplicate test call in Game.java
2016-05-15 21:05:37 +02:00
xGamingDudex
d850bed725
Minor code tweaking
...
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
2016-05-15 19:43:07 +02:00
xGamingDudex
29a0ba565b
Added better hollow calculations to ShapeBox and UtilBlock
2016-05-15 17:05:11 +02:00
xGamingDudex
296f304d29
Changed the way UtilItem.dropItem handles despawning
2016-05-15 17:04:50 +02:00
xGamingDudex
a8db293bcf
Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape
2016-05-15 17:04:25 +02:00
xGamingDudex
97f82e422d
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
2016-05-15 16:03:36 +02:00
xGamingDudex
aa36097729
Made Animator abstract and added final modifiers
2016-05-15 15:58:05 +02:00
xGamingDudex
22e54557d8
Fixed cleaning method for WineffectRiseOfTheElderGuardian
...
The class contained commented code, removed when debugging
2016-05-15 15:33:42 +02:00
xGamingDudex
abddc446fd
Added java docs and tweaked code
...
* Fixed possible duplication bug in MulitBlockUpdaterAgent
* Tweaked some of the factor methods for Shape.java
* Cleaned some code in ShapeWings.java
2016-05-15 15:32:44 +02:00
xXVevzZXx
44e52f4b5b
Add javadoc to added files
2016-05-15 10:24:29 +02:00
phobia
a67fec95fc
Remove ultra tag
2016-05-15 03:21:58 -05:00
xXVevzZXx
a1a6abc1ca
Add champions gladiators and fix tiny winners typo
2016-05-15 10:13:06 +02:00
LCastr0
1cc44d1b3e
Fixes for the following classes:
...
KitGameModifier
KitModifierType
MultiBlockUpdaterAgent
Shape
GadgetManager
KitModifierType
HatLovestruck
HatSecretPackage
SetLove
Animator
AnimatorEntity
AnimationPoint
ICosmeticShape
UtilText
KitGameModifier
KitModifierType
Removed build.xml and org.eclipse.jdt.ui.prefs
2016-05-15 00:20:07 -03:00
xGamingDudex
24f7a4b409
Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards
2016-05-14 18:53:09 +02:00
samczsun
b2e92fdf15
Don't pass on INTERACT_AT as INTERACT. Fixes PC-114
2016-05-14 09:42:28 -05:00
LCastr0
20b9f428b4
Fixes Illuminated Chest's Lore
...
Fixes Pinata Burst not being saved
Fixes AWP Asiimov and XM1014 Tranquility materials
Removes Fireworks WinRoom
Changes prices of things from 1 shard to Treasure Chest
More unused imports removed
Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN
Adds javadoc to UtilColor.applyColor()
Adds javadoc to UtilColor.getNextColor()
defaultLeatherColor -> DEFAULT_LEATHER_COLOR
Adds suggestions for UtilColor
Adds final modifier to _worldBorders (UtilPlayer)
Changed _worldBorders key from String to UUID
Adds suggestion for UtilPlayer
Adds final modifier to _type (GameModifierSubPage)
Adds final modifier to _type and _kitType (KitGameModifierPage)
DefaultDencity -> DefaultDensity (Shape)
Changed <Vector> to <> (Shape)
dencity -> density (ShapeBox, ShapeGrid, ShapeSphere)
Using speed and count in constructor (ShapeWings)
Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent)
Adds final modifier to all fields (AnimationPoint)
2016-05-14 01:18:37 -03:00
Shaun Bennett
b802cdec6d
Rename shop to "Fountain Keeper"
2016-05-14 14:01:28 +10:00
xXVevzZXx
63c44afa10
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
2016-05-13 22:05:27 +02:00
xXVevzZXx
df5c628c35
add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown
2016-05-13 20:23:04 +02:00
xGamingDudex
0544e86cb1
Started fixing the stat tracking for MS knife
2016-05-13 02:39:43 +02:00
xGamingDudex
2cc609b67e
Moved some rewards from normal to valentines
2016-05-13 01:28:26 +02:00
xGamingDudex
35ab155756
Removed unnecessary lore from minestrike game modifiers
2016-05-13 01:20:06 +02:00
xGamingDudex
d34f77a381
Moved some rewards from normal to winter chest
2016-05-13 01:19:06 +02:00
xGamingDudex
9c2c415eb2
Fixed the emerald trail leaving from idle to moving
2016-05-13 01:14:00 +02:00
xGamingDudex
3bb3821fa9
WinEffect gadget disable and MineStrike name and data update
2016-05-13 01:04:35 +02:00
xGamingDudex
4958ab8149
Bug Fixes
...
* Fixed Menu page adding glow to win effects if game modifiers were
active
* MineStrike skins were not properly applying material and data
* Skinned knife was not dealing damage
2016-05-13 00:38:56 +02:00
xGamingDudex
06e583c05e
Added flat podium to Firework and Punchman
2016-05-12 23:50:41 +02:00
xGamingDudex
956d64d750
Git Merge Import Fix
2016-05-12 23:46:39 +02:00
xGamingDudex
29d4db0bfd
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
2016-05-12 23:46:17 +02:00
xGamingDudex
2db98613ab
Cosmetic Update
...
* Redid the Reward manager
Added new rewards to the chest and changed some values
* Fixed some MineStrike skin bugs
* Removed particles/death effects from Minestrike
* Removed old test minestrike skins
* Moved minestrike skins to correct package
* Changed the illuminated chest animation a bit
* Fixed other minor bugs
2016-05-12 23:42:37 +02:00
AlexTheCoder
fab24e2139
Allow admins to be opped on testing servers
2016-05-12 17:24:37 -04:00
LCastr0
6f4c6bc545
Fixes counter on WindUp suit
...
Removes kit modifier categories
2016-05-12 15:00:43 -03:00
Sam Sun
2ae072f5b7
Rename modules to correct name
2016-05-12 11:44:35 -04:00
Keir Nellyer
13ff2e5263
Fix query for pulling report profiles
...
Previously we didn't check that the user actually reported an issue so in effect we were creating a report from every single logged incident (regardless of whether the user in question was involved).
2016-05-12 14:38:04 +01:00
Keir Nellyer
814f3516de
Make the chat abuse color easier on the eyes
...
Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.
2016-05-12 14:22:19 +01:00
Alex-The-Coder
05312a9bef
Update where players spawn upon first join...
...
...to avoid flight kick upon login
2016-05-11 21:57:42 -04:00
xGamingDudex
276f572009
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
2016-05-10 20:21:37 +02:00
xGamingDudex
1b0b9a894b
Tweaked some cosmetics
...
* Changed Party Death to firework icon
* Removed idle spark from Emerald Trail
* Changed wing style to pixie from angle on infernal wings
* Added black dots to YinYang
Started some work on the RewardManager
2016-05-10 20:20:44 +02:00
LCastr0
4fada6de49
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-10 12:45:22 -03:00
LCastr0
5b8ff933b1
Removed more unused imports
...
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
Fixed set descriptions
Added 'Comming soon...' to set bonuses
2016-05-10 12:44:45 -03:00
Conrad
8eba2c9ccb
Merge pull request #59 from Mineplex-LLC/feature/logitech-brand
...
Move billboard up 1
2016-05-09 11:55:22 -04:00
AlexTheCoder
7932258579
Move billboard up 1
2016-05-09 03:44:16 -04:00
AlexTheCoder
de1fabf53d
Disable report system as it is not ready to go live
2016-05-09 02:10:51 -04:00
cnr
4aa44cd796
Merge branch 'develop' into clans/beta
2016-05-08 16:53:48 -05:00
Keir Nellyer
7c80c3826b
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-05-08 21:49:16 +01:00
Conrad
ac86f3ac8c
Merge pull request #55 from Mineplex-LLC/alex-mcl
...
Change the visuals of the Billboards and of ELO's display in the stat…
2016-05-08 13:29:23 -04:00
AlexTheCoder
34e8d65f4d
Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly
2016-05-07 21:16:12 -04:00
cnr
b47c49d93b
Temporarily disable clans ban functionality
...
This can be reverted when clans bans are properly audited/fixed/tested.
2016-05-07 19:02:19 -05:00
Keir Nellyer
b68127b111
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-05-08 00:37:59 +01:00
Keir Nellyer
b1a41c3cb3
Make chat abuse colour easier on the eyes
...
Dark blue [bold] is hard to read, dark aqua [bold] should be easier
to read.
2016-05-07 22:48:49 +01:00
xXVevzZXx
d75ba9d4c0
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
2016-05-07 22:26:15 +02:00
phobia
38f22b1577
Disable obsidian dropping after breaking THE BLOCK
2016-05-07 19:51:19 +10:00
xGamingDudex
5649939f8c
Removed some old disabled code.
2016-05-06 21:59:18 +02:00
xGamingDudex
e04a897488
Added some pre-animation to chicken win effect. Removed some comments.
2016-05-06 21:58:31 +02:00
xGamingDudex
0fea90516b
Alternative emerald trail for full set
2016-05-06 13:24:06 +02:00
xGamingDudex
f58db6ee3b
Removed firework from party death
...
Replaced the death effect with item drops instead
2016-05-06 13:12:28 +02:00
xGamingDudex
d60fea4f76
Added chicken and guardian win room schematic handlers
2016-05-06 13:00:45 +02:00
Shaun Bennett
60dce9ef1b
Change LT, Owner, Developer, Admin to DARK_RED
2016-05-06 13:43:30 +10:00
LCastr0
97ef801e3d
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-06 00:40:55 -03:00
LCastr0
49c45628a2
Removed more unused imports
...
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
2016-05-06 00:40:22 -03:00
Shaun Bennett
93c2886601
Add boosters to inventory menu
2016-05-06 13:31:59 +10:00
xXVevzZXx
9f2189d173
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2016-05-06 03:40:00 +02:00
Conrad
55d40a1a6b
Merge pull request #53 from Mineplex-LLC/feature/logitech-brand
...
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:33:15 -04:00
AlexTheCoder
f329051399
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:25:51 -04:00
xGamingDudex
17a4517e71
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2016-05-05 21:03:15 +02:00
xGamingDudex
1a96ea3c18
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-05 20:29:28 +02:00
xGamingDudex
db21c7dd22
EGit FTW!
...
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....
This should have been part of prev commit.
2016-05-05 20:26:00 +02:00
xGamingDudex
875fb4eccd
The big bug fix batch
...
+ Added some text utils
+ Added angel wing shape
* Tweaked the wing particle effects.
* Fixed item tool not despawning items in arcade servers
* Removed strange gadget disable
* Updated some death/win effects and particles
* Added Illuminated chest
* Added MS skin name to death message
2016-05-05 20:07:29 +02:00
xGamingDudex
9fca9283e2
Fixed skin layers for Player/Human disguises
2016-05-05 10:39:00 +02:00
Keir Nellyer
e1f2bb9740
Use all-man style braces here to be compliant with the coding standards
...
(cherry picked from commit e553ac5
2016-05-04 16:02:39 +01:00
Keir Nellyer
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
Conrad
d7d00e1614
Merge pull request #52 from Mineplex-LLC/alex-mcl
...
Add a method for simply checking if a player has been participating i…
2016-05-04 09:30:00 -04:00
Thanos Paravantis
e7f97fa5b8
Move life related methods to challenge class
2016-05-04 16:21:14 +03:00
Thanos Paravantis
9d53eddabd
Fix lives amount display and remove disguises
2016-05-04 15:40:43 +03:00
Thanos Paravantis
703e957156
Fix volley pig health and knockback message
2016-05-04 15:38:18 +03:00
Thanos Paravantis
2b362ee4f1
Fix egg smash eggs sometimes stay on the map
2016-05-04 15:37:16 +03:00
AlexTheCoder
0e509898ec
Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system
2016-05-03 21:07:50 -04:00
Conrad
145ea9221a
Merge pull request #40 from Mineplex-LLC/clans/beta
...
Clans/beta
2016-05-03 16:57:07 -04:00
LCastr0
cfc6f3703d
Merge pull request #50 from Mineplex-LLC/develop
...
Merge from develop
2016-05-03 13:24:32 -03:00
cnr
57fca2a8d0
Temporarily(?) mitigate spigot CME
...
During a PlayerVelocityEvent in an unloaded chunk (usually as result of
a teleport), if one calls Location#getChunk() on the player's location,
and the chunk contains persistent entities, the server crashes with a
ConcurrentModificationException.
2016-05-03 04:56:31 -05:00
xXVevzZXx
838cc2ce31
fix enchantments and increase arrow amount in gladiators
2016-05-02 23:01:59 +02:00
Conrad
3c482e38cc
Merge pull request #47 from Mineplex-LLC/feature/logitech-brand
...
Convert over to System.out.println() for error messaging and add prot…
2016-05-02 16:34:58 -04:00
Conrad
2cd76fbf72
Merge pull request #48 from Mineplex-LLC/alex-mcl
...
Add catch for rare occurrence where players have no stored data
2016-05-02 16:34:50 -04:00
AlexTheCoder
3d98c08a67
Add in missing file
2016-05-02 16:33:11 -04:00
AlexTheCoder
ccd5b47d75
Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager
2016-05-02 16:20:41 -04:00
xXVevzZXx
8dd89d9dea
fix minor bugs and improve minor things in bridges, sg, uhc, quiver, runner and skywars
2016-05-02 20:27:43 +02:00
Ben
cd2bd8ac1d
Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever.
2016-05-02 11:49:56 +01:00
Ben
8a1b5572a8
Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan.
2016-05-02 10:31:45 +01:00
LCastr0
055b8684c2
- Added action bar message when booster is ready (Wind Up Suit)
...
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
2016-05-02 00:13:06 -03:00
xXVevzZXx
71f8640189
implement Dukes of decoration, OP Gladiators, Countdown, Heroes of the ewe, OP Skywars, Ultra spleef, Assassins and Blood diamonds
2016-05-02 01:06:00 +02:00
Ben
026ab15099
Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned.
2016-05-01 23:20:55 +01:00
Ben
1e18707fd7
Include the missing PlayerMessageEvent, as I had also forgotten to add documentation about the class.
2016-05-01 23:06:30 +01:00
Ben
480cc0f9be
Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand.
2016-05-01 23:04:30 +01:00
Ben
e139bea465
Fix kill messages inserting a space below them in chat.
2016-05-01 23:03:18 +01:00
Keir Nellyer
fa017c185d
Add method to load ReportProfile from database
2016-05-01 22:48:02 +01:00
Keir Nellyer
41bc9672ab
Remove un-needed imports
2016-05-01 21:49:08 +01:00
Keir Nellyer
ccf14d0d2a
Declare final variables in ReportCategory
2016-05-01 21:12:01 +01:00
Keir Nellyer
132f431a94
Map each ReportResult to its id in the database
...
We no longer use the statistic system to store the results of reports but rather store the result of each ticket in a database table.
2016-05-01 21:10:55 +01:00
Keir Nellyer
1d36d4c4b9
Map each ReportCategory to it's id in the database
2016-05-01 21:04:20 +01:00
AlexTheCoder
7e97bd346e
Change an internal method to private and add missing class JavaDoc
2016-05-01 15:16:42 -04:00
AlexTheCoder
335c5a4510
Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard
2016-05-01 14:58:40 -04:00
xXVevzZXx
6c2caac800
fix some format issues and implement God battles
2016-05-01 19:43:42 +02:00
xXVevzZXx
7bd6cdb93c
Implement Lists and Maps into the variable system and finish more gamemodes
2016-05-01 18:48:07 +02:00
Ben
eae972a3e6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 10:11:28 +01:00
Ben
9d97ea8d1e
Missing Clans ban cache class (to do with the commit previously by me)
2016-05-01 10:11:17 +01:00
cnr
4cffb39941
Delay dismount teleport by one tick
...
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
2016-05-01 01:30:42 -05:00
AlexTheCoder
48c8a5a630
Force structure to spawn correctly, complete with maps on item frames
2016-05-01 01:56:07 -04:00
Ben
189f9ad524
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 01:42:32 +01:00
Ben
2337e89a93
Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.
2016-05-01 01:42:11 +01:00
cnr
8ca38b2598
Prepend http:// to resource pack locations
2016-04-30 18:54:17 -05:00
AlexTheCoder
070326e72d
Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding
2016-04-30 19:26:16 -04:00
Keir Nellyer
e553ac5aab
Use all-man style braces here to be compliant with the coding standards
2016-04-30 23:12:25 +01:00
Keir Nellyer
bce218a65e
Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-04-30 23:11:35 +01:00
cnr
10166f063b
Merge branch 'develop' into clans/beta
2016-04-30 16:16:57 -05:00
phobia
14204fba5c
Changed resource packs to home hosted ones
2016-04-30 16:02:26 -05:00
phobia
890ab9f67e
Uncommented ClansBanManager's instances
2016-04-30 16:02:26 -05:00
phobia
f1c2e71d56
Some changes to error handlng for clans regions
2016-04-30 16:02:26 -05:00
cnr
634a34dd52
Reintroduce non-Air constraint to cannon explosion
2016-04-30 16:02:26 -05:00
cnr
2eb7b892e0
Refactor cannon explosion effect for clarity
2016-04-30 16:02:26 -05:00
cnr
f2f627116a
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-30 16:02:26 -05:00
AlexTheCoder
39c105f0cf
Add catch for rare occurrence where players have no stored data
2016-04-30 15:34:04 -04:00
Conrad
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
Conrad
e0e30a8b7f
Merge pull request #43 from Mineplex-LLC/alex-mcl
...
Fix Async Elo Ranked Bans
2016-04-30 14:46:49 -04:00
AlexTheCoder
37a815d52a
Update JavaDocs to fit Mineplex standard
2016-04-30 14:41:28 -04:00
AlexTheCoder
2e4bae6915
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-30 14:14:14 -04:00
AlexTheCoder
2dc5c46624
Fix naming convention on checkRankBannedAsync
2016-04-30 14:13:21 -04:00
AlexTheCoder
41e26f283c
Fix all async elo ranked ban methods and switch to callback system for API hooks
2016-04-30 14:10:09 -04:00
TadahTech
6e35bc0989
Stop spamming the chat.
2016-04-30 00:55:59 -05:00
Keir Nellyer
2490e3df82
Previous git merge cause this single line to be deleted
...
I literally have no idea why or how this happened.
2016-04-29 23:47:01 +01:00
Keir Nellyer
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
Keir Nellyer
81cebc4ce7
Swap static helpers for a much better solution
...
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.
Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
Thanos Paravantis
89bd325c81
Fix continuous milking sound on milk a cow
2016-04-29 14:35:48 +03:00
Thanos Paravantis
aff5396384
Prevent death effect armor stand modification
2016-04-29 13:41:16 +03:00
Shaun Bennett
184d247fc9
Start adding BoosterPage. Move Boosters to core to support UI's
2016-04-29 17:37:34 +10:00
phobia
f63a872bd4
Changed resource packs to home hosted ones
2016-04-29 14:46:14 +10:00
AlexTheCoder
a8d9745320
- Fixed order of Top Elo
2016-04-29 00:12:25 -04:00
phobia
c814fc73f7
Uncommented ClansBanManager's instances
2016-04-29 12:53:20 +10:00
TadahTech
26f6a1189f
Prettyfy EloCommand
2016-04-28 21:34:43 -05:00
TadahTech
e83e4b270c
Prettyfy EloCommand
2016-04-28 21:34:07 -05:00
TadahTech
00efb7d72e
Fix ELO query
2016-04-28 21:20:48 -05:00
TadahTech
84ca13c0d3
Fix ELO query
2016-04-28 21:09:28 -05:00
TadahTech
80ea7b7a4c
Fix ELO query
2016-04-28 21:09:07 -05:00
TadahTech
5a4f89b484
Fix ELO query
2016-04-28 21:04:07 -05:00
AlexTheCoder
7c279998ec
- Changed top elo queries
2016-04-28 21:55:51 -04:00
AlexTheCoder
8e68d62356
- Added documentation for new EloManager methods
2016-04-28 21:16:18 -04:00
AlexTheCoder
2887630cf8
- Added javadoc headers
2016-04-28 21:11:38 -04:00
AlexTheCoder
4b7684da4c
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-28 21:05:56 -04:00
AlexTheCoder
e032b81842
- Made SQL calls async
2016-04-28 20:59:49 -04:00
TadahTech
562e950361
Remove File headers.
2016-04-28 19:46:13 -05:00
TadahTech
680e579223
Merge Alex's branch into mine.
...
Convert to Java 8
Remove unneeded comments.
2016-04-28 19:39:24 -05:00
TadahTech
168483a9fc
Communities work
2016-04-28 19:30:05 -05:00
TadahTech
725481f310
Top Elo data for Webpage
2016-04-28 19:23:57 -05:00
TadahTech
84c0b1b389
Top Elo data for Webpage
2016-04-28 19:22:45 -05:00
AlexTheCoder
156982460f
- Fixed water permanently [MCL]
...
- Fixed team balancing [MCL]
- Fixed overjoining [MCL]
- Changed bans for quitting ranked matches [MCL]
2016-04-28 20:03:09 -04:00
Keir Nellyer
5dbb3744d1
Improve reputation map initialization logic
2016-04-28 23:52:26 +01:00
Keir Nellyer
c82dd27b64
Make getValueOf method more robust
2016-04-28 23:36:41 +01:00
AlexTheCoder
b105ccb5f1
- Change event priority
2016-04-28 17:48:16 -04:00
AlexTheCoder
b13528ed66
- Further blockage of creating source blocks [MCL]
2016-04-28 17:46:57 -04:00
AlexTheCoder
3f9ef24235
- Removed debug message
2016-04-28 17:44:37 -04:00
William Burns
5d1194192d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/jobs-site
2016-04-28 18:19:45 +01:00
Thanos Paravantis
8874b52b39
Merge branch 'develop' into thanos-mineware
2016-04-28 19:27:56 +03:00
Thanos Paravantis
6084d04a0f
Commit before pulling from develop
2016-04-28 19:23:21 +03:00
Thanos Paravantis
992e150608
Refactor and comment classes
...
New javadoc comments have been added to describe class functionality
and variable usage on specific places.
2016-04-28 16:54:46 +03:00
Keir Nellyer
bff5751691
Remove very last @author tag
2016-04-28 14:41:44 +01:00
Thanos Paravantis
3a5ec7dc5d
Continue refactoring and comment main class
2016-04-28 13:11:27 +03:00
Thanos Paravantis
6cc8f854c4
Refactor main game class
2016-04-28 13:02:44 +03:00
Thanos Paravantis
3161cd53e9
Apply new format on floating holograms
2016-04-28 12:31:09 +03:00
AlexTheCoder
dcd376b837
- Improved graphics for Elo display in /stats
2016-04-28 01:01:14 -04:00
AlexTheCoder
189296a586
- Fixed using water in restricted zones in MCL
...
- Implemented Elo in /stats menu
2016-04-28 00:53:04 -04:00
AlexTheCoder
46f873634e
- Decrease time till Overtime in MCL
...
- Block ability to flood in MCL
2016-04-28 00:33:36 -04:00
AlexTheCoder
b4c5be81f3
- Fixed random weather in MCL
...
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
William Burns
d90e9e7dff
Add a system for allowing all players to use game commands when in the correct mode.
2016-04-27 20:54:52 +01:00
Thanos Paravantis
aff4b6b270
Fix minecart dance double life loss
2016-04-27 22:09:06 +03:00
William Burns
b8d12c0c9d
Small wording changes.
2016-04-27 20:04:36 +01:00
xXVevzZXx
1b5b18c9b2
Prevent exception while adding variables to gamemodes
2016-04-27 17:50:01 +02:00
xXVevzZXx
aa219ec3e5
Implement gamemode feature with modifiable variables and working on first moded games
2016-04-27 17:42:50 +02:00
Thanos Paravantis
ddad17855f
Improve chicken spawning on chicken shooting
2016-04-27 18:37:42 +03:00
Thanos Paravantis
f8ff99fc58
Increase hologram height gain and expire time
2016-04-27 18:37:09 +03:00
Thanos Paravantis
e3a6a0a50a
Fix spawns and map generation on smash off
2016-04-27 18:36:16 +03:00
Thanos Paravantis
c6b1065c4e
Fix scoreboard player team after death
2016-04-27 18:35:39 +03:00
Thanos Paravantis
9407265c73
Display predefined items on diamond hunt
2016-04-27 14:02:43 +03:00
Thanos Paravantis
ba5d06db88
Fix tag master and achievement progress
2016-04-27 13:14:20 +03:00
AlexTheCoder
a16145479e
- Disabled picking up lava
...
- Leaving ranked matches temp bans players from rejoining them
2016-04-27 03:18:44 -04:00
Thanos Paravantis
ccebeb75f1
Implement challenge team spawning
...
Team based challenges are now handled differently from the normal ones.
When the game or challenge starts, instead of spawning all players
with the default team spawn method, they are teleported according
to their team. For example, if a player is on the blue team, he
will be teleported on the blue side of the map. Moreover, teams
are now generated properly, by diving the total number of players by
two. One drawback, that will be fixed in a next commit, is that team
challenges require an even amount of players.
2016-04-27 09:41:02 +03:00
LCastr0
d0e7590b2a
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-04-26 23:23:45 -03:00
LCastr0
a7ef8bec49
Adds new constructor to NotePlayer, to be able to send the song to specific players
...
Some WindUp costume fixes
Added actionbar and song to WindUp suit
Created new booster manager
2016-04-26 23:21:59 -03:00
xGamingDudex
38d03b8468
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-04-27 00:03:29 +02:00
xGamingDudex
79f210e242
Schematic and WinEffect update
...
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
2016-04-27 00:01:30 +02:00
Shaun Bennett
41e2ea6490
Fix off by one error in GoalCounter
2016-04-26 16:20:14 +10:00
Shaun Bennett
714000163b
Add messages when fountain is complete and resets
2016-04-26 16:19:27 +10:00
Shaun Bennett
4a8c38e1c8
Add fountain reset command
2016-04-26 15:33:52 +10:00
Shaun Bennett
cabf4c4c8b
Add BlockProgressBar for Gem Fountain
2016-04-26 15:26:07 +10:00
Shaun Bennett
e8370579c0
Counter refactoring
2016-04-26 13:55:06 +10:00
Thanos Paravantis
38769d9616
Add missing tracker classes
2016-04-25 23:01:41 +03:00
Thanos Paravantis
d945bfa17a
Fix array out of bounds on veteran tracker
2016-04-25 23:01:17 +03:00
Thanos Paravantis
d0336be7b7
Add new achievements and modify current ones
2016-04-25 22:59:24 +03:00
Thanos Paravantis
41ef1a757c
Prevent null winner on veteran tracker
2016-04-25 18:03:25 +03:00
Thanos Paravantis
7c92971346
Remove new thread and use bukkit runnable only
...
Previously, a new thread was created to display the description
of a challenge. Instead of creating a new one, only a single
bukkit runnable is now created. With that change, when the challenge
is skipped, the correct description will show up instantaneously.
2016-04-25 18:00:37 +03:00
Thanos paravantis
a6bf059e6c
Modify challenge names and challenge intro titles
2016-04-25 12:47:55 +03:00
LCastr0
f0cfac8e73
Merge pull request #31 from Mineplex-LLC/develop
...
Merge from develop
2016-04-24 23:15:36 -03:00
LCastr0
28de514d1a
Adds some utils for UtilColor
...
Small changes in Wind Up suit
2016-04-24 21:39:35 -03:00
Thanos paravantis
c214431cbf
Move and rename stat trackers
2016-04-24 22:44:42 +03:00
Thanos paravantis
856eb6059b
Update statistics and implement data tracker
2016-04-24 22:39:56 +03:00
Keir Nellyer
8969ec172b
Merge branch 'feature/report' into feature/report-v2
2016-04-24 18:26:10 +01:00
Keir Nellyer
949f9ca712
Don't allow players to report themselves
...
I left this to last minute to make testing easier, as with this check
in place it means at least two players are required to test the report
mechanism.
2016-04-24 18:10:01 +01:00
Keir Nellyer
96aa5d1c4b
Removed duplicate code
...
Somehow this got duplicated and so therefore was causing compile time
errors, might have been something to do with my git merge.
2016-04-24 17:22:21 +01:00
Keir Nellyer
dab1f9485c
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-04-24 17:17:17 +01:00
Keir Nellyer
9df4dac023
Remove dead code
...
This was left over from before I took over development of the report
feature.
2016-04-24 17:16:36 +01:00
Keir Nellyer
713263214f
Run ReportPurgeTask asynchronously
...
This prevents the task from hanging the server which may be an issue
when a large amount of reports exist.
2016-04-24 17:15:12 +01:00
Keir Nellyer
57e9cd6e19
Add class headers and remove @author tags
...
This makes the PR compliant with with the Mineplex coding style.
Class headers are used to describe the function of a class and git
history will be used to determine the author of a class.
2016-04-24 17:10:29 +01:00
Keir Nellyer
84f5bd2f31
Handle abusive report types
2016-04-24 16:51:01 +01:00
Thanos paravantis
e2a6500bce
Update game achievements
2016-04-24 13:37:39 +03:00
Shaun Bennett
a0fd852537
Move field to top of class in Game
2016-04-24 13:38:58 +10:00
Shaun Bennett
b21dfad12e
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2016-04-24 13:37:45 +10:00
Shaun Bennett
c60beec68c
Implement Fountain GUI
2016-04-24 12:40:38 +10:00
LCastr0
491c509317
Added UnlockCosmetics command (/unlockCosmetics <type>)
...
Added Ammo command (/ammo <gadget> <ammo> [player])
Added util for red world border screen (UtilPlayer.sendRedScreen)
Added new costume -> Wind Up
Removed test gadget (ItemBouncyBall)
2016-04-23 22:16:02 -03:00
Thanos paravantis
bfabfab2d1
Fix circle spawn locations
2016-04-24 00:27:39 +03:00
phobia
b21939444c
Some changes to error handlng for clans regions
2016-04-23 16:40:39 +10:00
cnr
c7970d1bd0
Prevent super paintball spectators from reviving teammates. Fixes PC-103
2016-04-22 19:48:03 -05:00
xGamingDudex
ccd630e2ae
Leftovers from merge
2016-04-23 00:56:19 +02:00
xGamingDudex
b7099088a9
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
Thanos paravantis
c526c86813
Add notes to fix recent bugs
2016-04-22 23:26:53 +03:00
Thanos paravantis
fa75bc15ad
Merge branch 'develop' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-04-22 22:03:15 +03:00
Jonathan Williams
fe0cee65e8
Added gem and coin rewards back into bonus.
2016-04-22 05:33:25 -05:00
Jonathan Williams
260c617007
Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop
2016-04-22 05:12:30 -05:00
Jonathan Williams
e28621ae26
Set oldElo equal to new elo on new row.
2016-04-22 05:04:13 -05:00
AlexTheCoder
2a4c3209b4
- Enable ELO
2016-04-22 05:44:56 -04:00
AlexTheCoder
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
Jonathan Williams
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
Jonathan Williams
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
Jonathan Williams
6db7e648f5
Don't insert new row if the update doesn't succeed because of elo mismatch on loss.
2016-04-22 04:20:59 -05:00
Jonathan Williams
7b18efa7b0
Prevent farming elo up with multiple games by dc and joining new game.
2016-04-22 04:05:07 -05:00
Jonathan Williams
ddd1c5af9b
Removed EloSettings and fixed scoreboard.
2016-04-22 03:10:09 -05:00
Jonathan Williams
34f94c0381
Reverted scoreboard because of MC maxlines turd nugget.
2016-04-22 02:55:27 -05:00
Jonathan Williams
a31eccc15b
Multiply new rating by team size. MIssed that undo!
2016-04-22 02:53:02 -05:00
Jonathan Williams
4577cf0398
Fixed scoreboard :D
2016-04-22 02:47:48 -05:00
Jonathan Williams
7cc4811ede
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo
2016-04-22 02:39:35 -05:00
Jonathan Williams
f922be51fe
Scoreboard tweak.
2016-04-22 02:39:08 -05:00
AlexTheCoder
04fe30df43
- Fix sb
2016-04-22 03:38:20 -04:00
AlexTheCoder
5e255fc4ed
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:36:21 -04:00
Jonathan Williams
757c945320
Added in kFactor ratio application to rating delta.
2016-04-22 02:35:37 -05:00
AlexTheCoder
03bdc8d2db
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:17:54 -04:00
Jonathan Williams
b69a75355c
Fixed scoreboard alignment.
2016-04-22 02:17:40 -05:00
Jonathan Williams
aa6d25139f
Tweaked elo for team games.
2016-04-22 02:04:57 -05:00
AlexTheCoder
b1c05e2ed0
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:12:02 -04:00
Jonathan Williams
776093288a
Fixed rating not setting in EloPlayer constructor.
2016-04-22 01:11:48 -05:00
AlexTheCoder
2d2c8858e6
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:06:55 -04:00
AlexTheCoder
1d3ad3c5fd
- Enabled ELO for testing
2016-04-22 02:06:37 -04:00
Jonathan Williams
977fbe684a
Fixed elo query.
2016-04-22 01:06:33 -05:00
Jonathan Williams
44d4255628
Added endElo in the appropriate spots.
2016-04-22 00:58:07 -05:00
Jonathan Williams
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
Shaun Bennett
8a5fdccb60
Add to fountain button
2016-04-22 11:26:05 +10:00
AlexTheCoder
d0e3b094c1
- cleaned up and prepped for live update
2016-04-21 20:57:35 -04:00
Shaun Bennett
86df07123c
Merge pull request #28 from Mineplex-LLC/bugfix/admin-command-npe
...
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:54:20 +10:00
Shaun Bennett
e46798f20e
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:49:34 +10:00
AlexTheCoder
e55bec505b
- Fix players ending up teleported back to arena due to broken respawn engine
2016-04-21 20:13:39 -04:00
