JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,153 Commits 1 Branch 0 Tags 481 MiB
76f587cff5
Commit Graph

9862 Commits

Author SHA1 Message Date
samczsun
e8becf3819 Op on dev servers too 2016-10-28 17:56:08 -04:00
samczsun
e7b744f527 UHC rewrite 2016-10-28 17:56:08 -04:00
Keir Nellyer
f0f01b74e8 PC-1016 Schedule cleanup task for everyday at 00:00 CDT 2016-10-28 18:13:20 +01:00
samczsun
7a0fba3027 Make Trick Or Treat chests open 4 2016-10-28 00:10:17 -05:00
Keir Nellyer
4b3cadbb5a Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
 2016-10-27 23:53:32 +01:00
Keir Nellyer
8283af25af Remove resolved todo for metrics command 2016-10-27 23:49:40 +01:00
Keir Nellyer
e7ff175eff Remove report site token todo message (is now resolved) 2016-10-27 23:48:54 +01:00
Keir Nellyer
30f56e3b12 PC-1016 Add cleanup task sql script 2016-10-27 23:40:09 +01:00
Keir Nellyer
100dc53ead PC-1150 Close div's correctly 2016-10-27 16:09:11 +01:00
Keir Nellyer
3bcfa6adc5 PC-1150 Only show information section of site when report is being 
displayed
 2016-10-27 15:34:07 +01:00
Shaun Bennett
577e640f4a Add KillAura Type E and F checks - no Action enabled yet 2016-10-26 23:00:47 -04:00
Shaun Bennett
0c0ad5ab13 PPC Items (#252) 
Update/ppc items
 2016-10-26 22:30:58 -04:00
LCastr0
a340f15d63 Fixed changes requested by Shaun 2016-10-27 00:27:50 -02:00
Shaun Bennett
f06325d972 Super Smash Mobs Update (#243) 
Update/ssm
 2016-10-26 22:03:43 -04:00
Alexander Meech
d13387df52 Make trick or treat chest dynamically controlled (#256) 
* Implement trick or treat chest in customer support server

* Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads
 2016-10-26 22:02:46 -04:00
Keir Nellyer
3bd575b718 PC-1153 Improve /reportmetrics usage 2016-10-26 13:29:11 +01:00
Keir Nellyer
79b5439aa4 Small refactoring 2016-10-26 10:50:49 +01:00
Keir Nellyer
a97ad8dd76 PC-1153 Don't allow days argument to exceed 30 days 2016-10-26 10:42:10 +01:00
Keir Nellyer
f5a81f083e Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-26 10:28:13 +01:00
Keir Nellyer
52d001c26e PC-1153 Add /reportmetrics command 2016-10-26 10:28:01 +01:00
Alexander Meech
39f0cd79bb Cap purchase date for sampson 2016-10-25 13:34:22 -04:00
Alexander Meech
3e8eecdf91 Update reward weightings for sigils 2016-10-25 13:34:22 -04:00
Alexander Meech
6d982f3df9 Fix spin ticket reward threading 2016-10-25 13:34:22 -04:00
Alexander Meech
273f95f8ff Fix playwire threading 2016-10-25 13:34:22 -04:00
AlexTheCoder
a36ebf4528 Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads 2016-10-25 13:34:22 -04:00
AlexTheCoder
ab228fb492 Implement trick or treat chest in customer support server 2016-10-25 13:34:22 -04:00
cnr
44e016f272 Fix infinite loop in GameWorldManager 2016-10-25 01:44:07 -05:00
Keir Nellyer
e4c7e31185 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-24 15:00:10 +01:00
Alexander Meech
d6dc750ece Prevent MPS servers with Lobbyblablabla-1 as... 
...the name from being loaded as an applicable lobby server
 2016-10-24 01:21:56 -04:00
xGamingDudex
eaee382e7f Small typo 2016-10-23 16:22:27 +02:00
xGamingDudex
c0ec1e1ff7 Prevent infinite speed effect on creeper 2016-10-23 03:11:51 +02:00
xGamingDudex
7b7b7aadf8 Fix a notorious XP bug in the wolf kit 2016-10-23 01:28:57 +02:00
xGamingDudex
1a847862d5 Prevent sometimes duplicate usage of the snowman smash 2016-10-23 01:28:04 +02:00
xGamingDudex
4531902adc Prevent guardian abilities from affecting team mates 2016-10-23 01:27:34 +02:00
xGamingDudex
0306d0d9d1 Fix chicken rocket to deal damage and knockback 2016-10-23 01:27:09 +02:00
Keir Nellyer
ff8f77f8d1 Rename these variables to make better sense 2016-10-22 23:08:59 +01:00
Keir Nellyer
ecd9dfef1a PC-1139 Update chatsnap site to support displaying of snapshots with 
no associated report
 2016-10-22 20:49:14 +01:00
xGamingDudex
2d0d78e1b7 Prevent snowman smash from affecting self, and give 3 snowmen 2016-10-22 21:28:11 +02:00
Keir Nellyer
c6ca976653 PC-1139 Add /chatsnap command 2016-10-22 20:23:31 +01:00
Keir Nellyer
81bf9bc406 Small method rename 2016-10-22 19:21:38 +01:00
Keir Nellyer
35048b46a7 Report/snapshot code clean-up 2016-10-22 19:17:20 +01:00
Keir Nellyer
e0d05d3c87 PC-1140 Keep reports region-separated 2016-10-22 15:06:18 +01:00
xGamingDudex
295f1f255f Fixed rare NPEs 2016-10-22 13:09:56 +02:00
xGamingDudex
720e965d08 Fixed chicken rocket. 2016-10-22 10:49:21 +02:00
xGamingDudex
4e433665cc Fixed golem smash affecting team mates 2016-10-22 10:49:02 +02:00
xGamingDudex
8414a17978 Don't apply velocity to team mates 2016-10-22 10:48:36 +02:00
xGamingDudex
d2be1fc646 Don't set team mates on fire on direct fireball hit 2016-10-22 10:48:09 +02:00
xGamingDudex
1ae89adfb0 Remove debug messages 2016-10-22 09:40:06 +02:00
LCastr0
6de2df5cc4 Fixed lores 
Fixed icons
Removed sleigh, chicken mount and wind up suit from menus
Added javadocs to sleigh
 2016-10-22 02:27:44 -02:00
LCastr0
83ba1cb26e - Removed debug message 
- Added check for player teleport when opening a chest
 - Added Turkey Morph and Chicken Mount to PowerPlayClubRewards
 2016-10-21 18:48:47 -02:00
LCastr0
0d6ff42a8d - Fixed players not being kicked from treasure chest locations when they are being opened 
- Increased the time needed for the Wind Up suit to be charged
 - Added effect for the Wind Up suit to blink between yellow and red when the effect is active
 2016-10-21 18:06:13 -02:00
Keir Nellyer
5f755add78 Rename /reportstats command to /reporthistory 2016-10-21 17:24:27 +01:00
LCastr0
56db128730 Merge pull request #251 from Mineplex-LLC/develop 
Merge 'develop' into 'update/ppc-items'
 2016-10-21 13:05:00 -02:00
xGamingDudex
cfd2343f0e Fixed zombie perk Deaths Grasp 2016-10-21 16:51:47 +02:00
xGamingDudex
b8c474a92d Fixed daze potion 2016-10-21 16:51:29 +02:00
xGamingDudex
bcfdfd4619 Added better team mate detection for team super smash 2016-10-21 16:51:16 +02:00
Keir Nellyer
b0ac3cac8c Show link to view chat log in /reportinfo 2016-10-21 09:32:11 -04:00
Keir Nellyer
63514029f2 Generate missing tokens for snapshots on report load 2016-10-21 09:32:11 -04:00
xGamingDudex
ff1d29bd2e Apply wool bomb damage to self in team games 2016-10-21 01:37:14 +02:00
xGamingDudex
70d554fa2d Fixed witch daze potion 2016-10-21 01:12:02 +02:00
xGamingDudex
ca0f36d142 Prevent armorstand used by laze to block projectiles 2016-10-21 00:55:44 +02:00
xGamingDudex
45c5ba66bd Prevent multiple perks from affect team mates and cleaned up some code 2016-10-21 00:55:18 +02:00
xGamingDudex
c8edc2d01e Rewrote daze potion damage calculations 2016-10-21 00:54:04 +02:00
xGamingDudex
6a6a589cb7 Fixed wolf cub sometimes not being removed 2016-10-21 00:25:37 +02:00
xGamingDudex
db3106d8a4 Prevent golem fissure from effecting team mates 2016-10-20 23:20:26 +02:00
xGamingDudex
d26103d321 Increase Whirlpool damage 2016-10-20 23:20:02 +02:00
xGamingDudex
d42a5f1897 Prevent Chicken Rocket from resetting cooldown when hitting team mates 2016-10-20 23:13:32 +02:00
xGamingDudex
08b7b7cb48 Removed unused files. Move wool bomb patch to correct file 2016-10-20 23:11:55 +02:00
xGamingDudex
7ad0b214a5 Change team display text 2016-10-20 23:08:40 +02:00
xGamingDudex
be2bc09896 Added comma to laser text 2016-10-20 22:56:12 +02:00
xGamingDudex
875bdc1fca Removed unused code 2016-10-20 22:50:12 +02:00
xGamingDudex
d119a94d53 Fixed concurrency issue 2016-10-20 22:44:43 +02:00
xGamingDudex
4e4fd2a8e9 Changed respawn title text 2016-10-20 22:44:13 +02:00
xGamingDudex
0705e38b3e Fixed NPE 2016-10-20 22:43:51 +02:00
Shaun Bennett
f8010f4ad0 Merge pull request #245 from Mineplex-LLC/update/report-improvements 
Report Feature Improvements
 2016-10-19 22:53:53 -04:00
samczsun
bafad1189b ProgressingKitManager: Temporarily add finally 2016-10-19 22:38:39 -04:00
samczsun
38ef65c32e Fix memory leak in ItemSnowball 2016-10-19 22:38:39 -04:00
samczsun
2ed03147b0 Make WinEffectGadget clean up even if exceptions occur 2016-10-19 22:38:39 -04:00
samczsun
5168044be5 Fix memory leak in WinEffectHalloween 2016-10-19 22:38:39 -04:00
samczsun
d2c0b34459 PlayerMap 2016-10-19 22:38:39 -04:00
samczsun
09fe7b736a Don't enable debugging 2016-10-19 22:38:39 -04:00
samczsun
bcb56c50f5 Fix memory leak in AntiHackGuardian 2016-10-19 22:38:39 -04:00
samczsun
25d6a4239e Fix memory leak in StatsManager, CombatManager 2016-10-19 22:38:39 -04:00
samczsun
2b6d7a4d7a Fix memory leak in ParticleFairy 2016-10-19 22:38:39 -04:00
samczsun
a59dde44c6 Remove recharge data on quit instead of later 2016-10-19 22:38:39 -04:00
samczsun
19eeae7f7f Fix memory leak in ParticleFoot 2016-10-19 22:38:39 -04:00
samczsun
6f80e21372 Fix memory leak in carl, server 2016-10-19 22:38:39 -04:00
samczsun
bd9aa38afa Make DisguiseManager clean up after lazy callers 2016-10-19 22:38:39 -04:00
samczsun
a338fb27d3 Various memory leak fixes 2016-10-19 22:38:39 -04:00
samczsun
b3ed9db2c7 Fix memory leak in ProgressingKitManager 2016-10-19 22:38:39 -04:00
samczsun
c00502d91f Fix memory leak in WinEffectPodium 2016-10-19 22:38:39 -04:00
samczsun
894e6b4a89 Fix memory leak in CombatLogNPC 2016-10-19 22:38:39 -04:00
samczsun
0cbd4a9de2 Fix memory leak in Teleport 2016-10-19 22:38:39 -04:00
samczsun
dbd5203e9d Fix memory leak in ParticleFreedom 2016-10-19 22:38:39 -04:00
AlexTheCoder
6719f11358 Fix playwire command not requiring console to use it 2016-10-19 22:36:03 -04:00
AlexTheCoder
13220e267c Re-enable animation 2016-10-19 22:36:03 -04:00
AlexTheCoder
16b195d2ab Make playwire-given carl spin tickets update while the player is logged in 2016-10-19 22:36:03 -04:00
AlexTheCoder
2e280d62de Block rain on the support server 2016-10-19 22:35:17 -04:00
AlexTheCoder
6d9d42cfdd Allow pets to be given from the support server 2016-10-19 22:35:17 -04:00
Alexander Meech
60fad6316b Ensure command used is actually /pumpkin 2016-10-19 20:59:12 -04:00
AlexTheCoder
26baf6aa67 Make Halloween pumpkins actually drop gems and shards in Block Hunt and Minestrike 2016-10-19 20:59:12 -04:00
AlexTheCoder
55b37e0261 Fix players being able to log in multiple times via different bungees 2016-10-19 20:58:05 -04:00
xGamingDudex
db9f358718 Increase Angry Heard durration 2016-10-20 02:01:40 +02:00
xGamingDudex
59712b4089 Prevent multiple abilities from dealing damage and knockback on teammate 2016-10-20 02:01:23 +02:00
xGamingDudex
21d004b3f2 Make the skelleton kit deal static 6 damage for arrows 2016-10-20 02:00:30 +02:00
xGamingDudex
6851a20e92 Fix /lives debug command 2016-10-20 02:00:01 +02:00
xGamingDudex
0d688534b1 Reduce slime smash durration 2016-10-20 01:28:25 +02:00
xGamingDudex
33a7deed58 Tweaked witch daze potion damage 2016-10-20 01:27:43 +02:00
xGamingDudex
74d6c599b5 Fixed snowman turret targeting team mates 2016-10-20 01:27:22 +02:00
xGamingDudex
82f1ec1ac6 Tweaked spider smash 2016-10-20 01:01:46 +02:00
xGamingDudex
2306dbc909 Fixed creeper XP 2016-10-20 01:01:31 +02:00
LCastr0
225f5c6b7c Internal: 
- Removed Win room test command
 - Fixed spelling error in MountSpider
 - Changed MountChicken so it can now jump
 - Still working on the Sleigh morph
 - Added Wind Up Suit for testing
 - Removed unused code from MountSpider

External:
 - Added Sleigh Morph (Still need some work on it)
 2016-10-19 18:44:57 -02:00
xGamingDudex
8de69d2573 Fixed guardian passive to acctually work 2016-10-19 17:49:59 +02:00
xGamingDudex
0b02bc9e2d Fixed with daze potion self damage and only randomly working 2016-10-19 16:35:49 +02:00
xGamingDudex
9e3cf58ff5 Type in blaze smash 2016-10-18 19:39:06 +02:00
Keir Nellyer
db0bfece23 Prevent re-saves from un-aborting user reports 2016-10-16 23:23:55 +01:00
Keir Nellyer
3db7e27ecd Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/report-improvements 2016-10-15 15:23:26 +01:00
xGamingDudex
35c9d2ecb1 Tweaked damage/KB values and fixed text issues 2016-10-15 14:56:38 +02:00
Keir Nellyer
1ab646bbda Fix error message colouring when there are no reports to handle 2016-10-14 19:14:50 +01:00
Keir Nellyer
64bb01c92f Move /reportabort functionality over to the /reportclose gui 2016-10-14 19:14:35 +01:00
Keir Nellyer
28603ec8c5 Remove resolved TODOs 2016-10-14 18:47:25 +01:00
Keir Nellyer
4b4dc74cbf PC-1000 Token column is now 8 characters 2016-10-14 16:29:04 +01:00
Keir Nellyer
b6bda9418d PC-1000 Make all token related things work together 2016-10-14 16:28:42 +01:00
cnr
8e7ae7f55f Make Power Play status clearer on support server 2016-10-14 00:26:33 -05:00
cnr
8ebad90f52 Don't lock current month's cosmetic on resub day 
This fixes an issue where a player might lose the current month's
cosmetic on the date of resubscription until his/her payment method was
charged
 2016-10-14 00:26:33 -05:00
cnr
0e5d8cc785 Replace pumpling spawn flicker with short glow 2016-10-14 00:25:55 -05:00
Keir Nellyer
3b7169ad3d PC-1000 Implement token generating method 2016-10-14 01:14:51 +01:00
Sam
76a413548b More unused imports 2016-10-13 23:31:32 +01:00
Sam
4810960d82 Stop visible armorstands 2016-10-13 23:19:11 +01:00
Sam
99c72a3b31 Fix debug command 2016-10-13 23:10:59 +01:00
Sam
e698037a73 Remove unused import 2016-10-13 22:44:48 +01:00
Sam
c93e6be98b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-13 22:43:08 +01:00
Sam
ca0da15b8c Fix magma cube 2016-10-13 22:43:04 +01:00
Sam
f72f6e8aaa Tweaks 2016-10-13 20:20:00 +01:00
Sam
a5d52d9e2f MERGE PLEASE! 2016-10-13 16:11:01 +01:00
Shaun Bennett
8974b2b395 Fix Carl Error 2016-10-13 04:07:05 -04:00
Shaun Bennett
bb32a06caf Add Halloween Words 2016-10-12 23:30:52 -04:00
AlexTheCoder
7ec530a8c7 Fix lobby protection on build server, make map locks persistent, implement larger parsing size, make map lock command require op, prevent raining on build server, and make block hunt actually work with any map with required information regardless of order 2016-10-12 23:01:25 -04:00
Shaun Bennett
62d08e74e3 Remove voting code 2016-10-12 22:54:14 -04:00
Alexander Meech
87122e9904 Update youtube link 2016-10-12 22:54:14 -04:00
Alexander Meech
63c14a99ab Update playwire displayed cooldown time 2016-10-12 22:54:14 -04:00
AlexTheCoder
6d36034115 Remove voting from carl the creeper, move spin tokens to playwire, unify link messages in all carl the creeper links 2016-10-12 22:54:14 -04:00
xADudex
311751cc39 Pumpkin's Revenge (#237) 
* Initial Commit

* Update

* Bunch of new stuff

* Fixed fletcher arrow typo

* Added reward pet, fixed typo, tweaked lose cinematic

* Lots of tweaks and fixes with QA

* Cleaning up a little code

* Removed debug message on prince death

* Added nighttime to halloween game lobby maps

* Tweaked spawn rates and mob caps

* Typo

* Tweaked texts, cleaned import and cleared all mobs from boss cinematic

* Fixed creepers not getting properly removed during boss cinematic

* Reward typo

* Fixed rare NPE

* Typos

* Tweaked mini zombie

* Typo

* Prevent zombie from spawning minis after being removed

* Tweaked wave announcements + formated WaveVictory

* Changed color of prince tag + formated ZombieSpawner

* Fixed (another) rare NPE

* Tweaked boss wave cinematic
 2016-10-12 22:40:05 -04:00
AlexTheCoder
66dfe06b34 Clean up bucket fixing in clans 2016-10-12 21:50:18 -04:00
AlexTheCoder
2ac7f72327 Fix clans water exploit and ruined pickaxe duping exploit 2016-10-12 21:50:18 -04:00
Keir Nellyer
03e219f552 Add header to /reportstats and further improvements 2016-10-13 02:15:49 +01:00
Keir Nellyer
2e16eef5d9 Make /reportstats work with offline players and other small improvements 2016-10-13 01:18:23 +01:00
Keir Nellyer
76539648da PC-1109 Fix /reportstats if player doesn't have at least 5 reports in 
each role
 2016-10-12 17:36:54 +01:00
Keir Nellyer
ca09253292 PC-954 Tweak error message when no reports are available for handling 
Also close gui after clicking item and remove old un-necessary code.
 2016-10-12 17:30:19 +01:00
Keir Nellyer
f42678a9ef PC-954 Fix incorrectly sized inventory 2016-10-12 17:23:42 +01:00
Keir Nellyer
eb6d893414 PC-954 Allow staff to select what kind of report they'd like to handle 2016-10-12 17:15:48 +01:00
Keir Nellyer
15cf3a2bee PC-1019 Give indication of when a report is forwarded to a team 2016-10-11 14:30:43 +01:00
Keir Nellyer
3dc9038bae Fix incorrect column name in statement 2016-10-11 01:22:43 +01:00
Keir Nellyer
1f47d51935 Merge branches 'develop' and 'update/report-non-sequential' of github.com:Mineplex-LLC/Minecraft-PC into update/report-non-sequential 
# Conflicts:
#	Plugins/Mineplex.ReportSite/view.php
 2016-10-11 00:55:26 +01:00
Keir Nellyer
f39ee7c247 Update chatsnap site to handle new token system 2016-10-11 00:45:33 +01:00
Keir Nellyer
5c5c159ee3 Add support for assigning tokens to snapshots (excluding actual 
generation part)
 2016-10-11 00:22:29 +01:00
Sam
2b2bb817be Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-09 12:24:51 +01:00
Sam
2b124cb16c I have really lost track on what I'm doing... 2016-10-09 12:24:49 +01:00
Shaun Bennett
0dca2e9d46 Fix BabyFirework NPE, TreasureLocation argument exception, Add TimingsFix to Hub 2016-10-08 19:42:29 -04:00
Sam
28a2a8c098 More from GI testing 2016-10-08 11:14:55 +01:00
Keir Nellyer
e4d3621512 Create SnapshotMetadata class in prepartion of snapshot tokens 2016-10-07 18:25:20 +01:00
LCastr0
8ab61b2b06 Public: 
- Added Chicken Mount
 - Added Turkey Morph

Internal:
 - Changed the Morph system (Using UtilMorph)
 2016-10-06 14:19:44 -03:00
LCastr0
3707de6742 Made Haunted Chests buyable 2016-10-06 12:43:19 -04:00
LCastr0
9f66bf438c Fixes for the CustomerSupport server 2016-10-06 12:43:19 -04:00
Sam
e5e953a8ab Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-06 15:03:53 +01:00
Sam
bb9ca490b1 GI changes 2016-10-06 15:03:51 +01:00
Kenny
0f44483f07 Merge pull request #233 from Mineplex-LLC/project-cosmetics 
Project cosmetics
 2016-10-06 04:31:56 -04:00
LCastr0
d6e9283cce Changed world time so its not too dark 2016-10-06 05:26:58 -03:00
Shaun Bennett
a6727bf104 Halloween Fixes/Prep 2016-10-05 22:57:44 -04:00
LCastr0
c0754a23c8 Fix Slime Soccer, Add /unlockcosmetics and /lockcosmetics for other players (#232) 
* Added option to run /unlockcosmetics and /lockcosmetics for other players

* Fixed Slimeball Soccer field location
 2016-10-05 22:08:27 -04:00
cnr
bd90c465dd Update PPC button to reflect new claiming style 2016-10-05 22:03:04 -04:00
cnr
20c37bf3d6 Unlock PPC cosmetics on the first of the month 
The relevant cosmetic will be revoked if the player's subscription
lapses during that month
 2016-10-05 22:03:04 -04:00
cnr
8793be56ed Add 'come back on $DATE' message to carl for Power Play 2016-10-05 22:03:04 -04:00
LCastr0
a1ec102419 Fixed Slimeball Soccer field location 2016-10-05 21:54:17 -03:00
LCastr0
5939c304a5 Added option to run /unlockcosmetics and /lockcosmetics for other players 2016-10-05 20:13:30 -03:00
LCastr0
876d35b482 Cosmetics Bug Fixes (#229) 
* 	Fixes for the Block Morph

* Fixes for the Witch Morph

* Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again
 2016-10-05 17:16:25 -04:00
Alexander Meech
dae3c60247 Make support text for power play claims more accurate (#228) 
* Make support text for power play claims more...

...accurate

* Reverse text
 2016-10-05 17:13:32 -04:00
Shaun Bennett
25000f7367 Merge pull request #226 from Mineplex-LLC/bugfix/report-hotfix 
Report feature hotfixes
 2016-10-05 17:13:08 -04:00
Lucas de Castro Queiroz
49510e6f9f Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again 2016-10-05 16:21:40 -03:00
LCastr0
314c88333a Merge pull request #230 from Mineplex-LLC/develop 
Merges develop into project-cosmetics
 2016-10-05 16:14:51 -03:00
Keir Nellyer
643656de0d Merge remote-tracking branch 'origin/bugfix/report-hotfix' into bugfix/report-hotfix 2016-10-05 15:32:05 +01:00
Keir Nellyer
e6bb0c2d78 Improve handling of circumstances whereby a report exists but no 
corresponding chatsnap log on chatsnap site
 2016-10-05 15:31:46 +01:00
LCastr0
8da5813f29 Add Halloween Cosmetics (#227) 
* Internal:
Changed imports from java.awt.Color to org.bukkit.Color

External:
Added Double Jump Halloween
Added Arrow Trail Halloween
Added Pumpkin Hat

* Internal:
Fixed Arrow Trail Halloween
Added new methods to ParticleData
Renamed playerNPC to _playerNPC (WinEffectLavaTrap)
Removed unecessary method (WinEffectManager)
Added a command to test win rooms properly
Fixed Squid Morph not showing name unless players hovered over it
Created a Manager for the Morphs so we avoid using deprecated methods

External:
Added Halloween Win Room
Added Grim Reaper Morph
Added Headless Horseman Morph
Added Nightmare Steed

* Internal:
Renamed RewardType enums to have upper case

External:
Added Halloween Death Effect
Added Haunted Chest
Added Baby Zombie Jockey Pet
Changed the names of the items
Added Grim Reaper pet

* Slack integration to test stuff (Will not be in the code in the last commit)

* Fixed Grim Reaper Hoe not being removed after the morph is disabled

* Details for the Haunted Chest

* Details for all the items (lores, icons, texts, effects, etc)
Removed Headless Horseman Morph

* Fixes for lores and names
Support server stuff

* Fixes for the Lock and Unlock cosmetics commands

* Fixes for the Grim Reaper Morph

* Fixes for the Grim Reaper Morph
Removed debug messages

* Fixed a memory leak. Thanks to Sam

* Fix imports

* Removed unused code
Added javadocs to UtilTextBottom#displayProgress()
Added javadocs to UtilAlg#getRandomLocation()

* Removed Death Effect
Increased Arrow Trail particles
Increased Double Jump particles
 2016-10-05 10:27:45 -04:00
Keir Nellyer
a4e1fb3c8d Prepare database for snapshot tokens 2016-10-05 14:31:01 +01:00
Keir Nellyer
46db80a056 Always check game object is not null before attempting to access it (#225) 2016-10-04 15:32:04 -04:00
Sam Sun
5d8c079be6 Understand the squid disguise code (#217) 2016-10-04 15:28:12 -04:00
Keir Nellyer
22707d6d2e Only execute if throwable is null 2016-10-04 16:34:19 +01:00
Keir Nellyer
6709001c89 Remove double handle check, pointless and can potentially cause issues 2016-10-04 16:25:51 +01:00
Keir Nellyer
afee339e16 Any report with a handler and no conclusion is an active report, 
therefore we don't need to check if the report is active
 2016-10-04 16:20:11 +01:00
Keir Nellyer
c462282632 Merge branches 'bugfix/report-hotfix' and 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/report-hotfix 2016-10-04 10:40:43 +01:00
LCastr0
515fd9fb70 Merge branch 'project-cosmetics' of github.com:Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-10-03 22:44:24 -03:00
LCastr0
fb29947705 Fixes for the Witch Morph 2016-10-03 22:43:49 -03:00
Sam
53c6c07208 Lazer to Laser 2016-10-03 23:17:14 +01:00
Sam
e48dfbefe4 Even more fixes! 2016-10-03 21:20:15 +01:00
Sam
4e9cf4dbb4 More fixes 2016-10-03 19:45:15 +01:00
Keir Nellyer
a923f80438 Accidentally missed out inserting reportTeams' "enums" 2016-10-03 19:24:01 +01:00
Keir Nellyer
17b04a6a84 PC-1021 Prevent 'null' player being punished 2016-10-03 10:00:04 +01:00
LCastr0
0181e21853 Fixes for the Block Morph 2016-10-01 23:54:35 -03:00
Sam
668abad83a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-01 15:49:10 +01:00
Sam
4bfc632fd5 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-01 15:45:05 +01:00
cnr
e867a09b5c Update support server to accommodate power play changes 2016-09-30 21:52:07 -07:00
cnr
6e2512e0cf Merge branch 'project-cosmetics' into develop 2016-09-30 21:47:08 -07:00
cnr
d00c887a84 Hide Power Play Metal Man reward for now 2016-09-30 21:00:02 -07:00
LCastr0
76fc4d6ac4 Merging 2016-10-01 00:46:36 -03:00
LCastr0
0797f90d3b Fixes for the Witch Morph 2016-10-01 00:42:40 -03:00
cnr
25701dae7d Enable Metal Man morph in the GUI 2016-09-30 20:25:57 -07:00
cnr
4b1b57d452 Add first-time signup Metal Man reward 2016-09-30 20:17:07 -07:00
cnr
64802769d6 Implement Power Play reward month calculations 2016-09-30 11:13:29 -07:00
Keir Nellyer
7926d88d5b Update report result reason length as future version of Minecraft 
will be increasing message lengths
 2016-09-30 17:18:47 +01:00
cnr
4fe5eb8b45 Stub out new Power Play rewards calculations 2016-09-30 00:10:42 -07:00
TadahTech
2a81f2b317 Fix UI for PlayWire changes 
Fix memory leak in Menu

(cherry picked from commit 770c899)
 2016-09-30 00:56:40 -04:00
Sam
36c26c0b2c Fix MineStrike Issues (#222) 
* Check if the costume is null before doing anything.

* Disable entity specing
 2016-09-29 23:37:41 -04:00
Sam Sun
81070eac62 Plug up memory leaks in IdleManager (#224) 
Somehow, IdleManager was keeping Player references loaded
despite having removed them on PlayerQuitEvent.

This may be because of the runnable scheduled for 5 ticks after a teleport
which would insert players after they quit.

In any case, this was keeping entire worlds loaded in UHC. Pretty bad.

Moral of the story? Use UUIDs!
 2016-09-29 23:29:53 -04:00
Alexander Meech
0caa84f703 Optimize Clan Banners (#221) 
* Optimize BannerRepository.java

* Optimize banner loading in BannerManager.java

* Optimize banner loading in ClansManager.java

* Remove unnecessary runAsync

* Optimize Siege Weapon storage

* Forgot a ! in my while loop
 2016-09-29 23:04:19 -04:00
Timothy Andis
7d4c817856 Game Lobby/Playwire/Command Fixes (#223) 
* Tweak team locations to accommodate MPS'
Disable certain commands from being used.

* Change PlayWire things.

* Update MPS locations.

* Update.

* Remove debug

* Remove debug. Ty Sam
 2016-09-29 23:00:26 -04:00
Keir Nellyer
2a2cd5024a Change message displayed when an error occurs 2016-09-30 01:56:49 +01:00
Keir Nellyer
ee532c1b8e Improve exception handling 2016-09-30 01:44:49 +01:00
Keir Nellyer
de72f119fe Don't allow players to handle new accounts in exceptional cases 2016-09-30 01:28:07 +01:00
Keir Nellyer
4818936943 Prevent double exception logging 2016-09-30 01:16:30 +01:00
Keir Nellyer
45eeac8cee Prevent double exception printing when an error occurs whilst saving 
a report
 2016-09-30 01:05:50 +01:00
Keir Nellyer
26d6540b2f Fix closing reason being truncated with long closing messages 2016-09-30 00:36:52 +01:00
Keir Nellyer
dd5a284d55 Print stacktrace when unable to fetch report player is handling 2016-09-30 00:29:57 +01:00
Sam
22f8a1496a Guardian fixes 2016-09-29 22:44:03 +01:00
Shaun Bennett
9d6985ddcd Fix MPS zip file name, null amp stand 2016-09-29 09:10:25 -04:00
Shaun Bennett
b3d8c72953 Add Game Lobby world settings (#220) 2016-09-29 00:22:42 -04:00
Shaun Bennett
7ff6e33941 LegacyGameLobbyManager bug fixes 2016-09-28 23:05:02 -04:00
Timothy Andis
620e219b14 Change MPS world zip (#219) 
* Change MPS map name
 2016-09-28 21:32:51 -04:00
Shaun Bennett
b27e1ffbd1 Reward shards on thank claim instead of when being thanked 2016-09-28 21:28:07 -04:00
Shaun Bennett
3ede0e5644 Merge Report System v2 (#216) 
Report system (v2)
 2016-09-28 17:39:26 -04:00
Timothy Andis
3d7647b26b Game Lobby Update (#215) 
* Game Lobby update. Phase 1.

* Correctly apply kit data to players who use the next best game feature.

* I can do integer comparisons, I promise.

* So much stuff, all minor.

* Suck it Carl.

* Fix Party bug.
Update LobbyManager

* Allow QA to test KitProgression @shaun cherry pick this plz.

* Proper generation check (testing)
Remove debugging from NextBestGame

* Correct Amplifier looking direction.
Fix Death tag hard coded kits
Misc podium work.

* ClansHub and Tweaks to the lobby manager

* WA Tweak.
 2016-09-28 10:17:05 -04:00
Keir Nellyer
31dcc87385 Slight code cleanup 2016-09-28 10:51:55 +01:00
Keir Nellyer
f8ad302d80 Simplify handling of optional reason 2016-09-28 10:41:56 +01:00
Keir Nellyer
6f77c05f1e Players should still be report banned if they reach abuse threshold 
even if reportCloser is not present

Also alert players of report closing regardless of whether
reportCloser is present
 2016-09-28 10:40:39 +01:00
Keir Nellyer
84e1a7291b Report result gui should handle messaging of player invoking team 
assignment
 2016-09-28 10:35:49 +01:00
Keir Nellyer
e54f70d194 JavaDocs for abortReport and assignTeam methods 2016-09-28 10:31:54 +01:00
Sam
c4e36b2269 Moppletop's September Bug Sprint (#214) 
* Earth Cost issue

* Instances of "Tip" to "Thank"

* PC-930

Fix an infinite loop when the game ends.

* PC-959

Fixes an issue where people could spam drop grenades.

* PC-668

Cosmetic Set bonuses no longer carry into MS games

* Changes metal's passive

Metal's passive is now that it gains 0.5 hearts per armor piece. This
avoids the problem of being unkillable
 2016-09-27 21:11:49 -04:00
Sam
78e6f3bf71 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-27 19:02:56 +01:00
Sam
68c62acb00 Guardian changes 2016-09-27 19:02:54 +01:00
Keir Nellyer
1543b539ba Refactor unbox optional collection to utility class 2016-09-26 11:01:27 +01:00
Keir Nellyer
f42681c390 Remove old todo 2016-09-26 10:33:46 +01:00
Keir Nellyer
f63561b05e Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-26 10:19:13 +01:00
Keir Nellyer
125428d09e Make getReport return Optional as it is quite likely that this will 
return null
 2016-09-26 10:02:30 +01:00
Sam
96e1e944e1 Addition of the GWEN kit and a billion other things 2016-09-25 22:32:23 +01:00
samczsun
b35d933e56 Fix PlayWire error, handle future errors properly 2016-09-25 16:28:02 -04:00
samczsun
3f3241bec9 Reformat developer servers 2016-09-25 16:28:01 -04:00
Keir Nellyer
32385d4064 Update error message for non-titans, due to change made in previous commit 2016-09-25 02:28:42 +01:00
Keir Nellyer
a413df9f52 Limit feature to titans for damage limitation 2016-09-25 02:01:10 +01:00
Keir Nellyer
42ea7f85af Remove un-required tab changes 2016-09-25 01:36:23 +01:00
Keir Nellyer
17b98888fc Update database upgrade script for latest changes 2016-09-25 01:29:18 +01:00
Sam
f8a135cf50 Full system conversion 2016-09-25 00:56:06 +01:00
Sam
315a50aa16 Whoops 2016-09-24 21:34:45 +01:00
Sam
baafa62713 Just more converting 2016-09-24 21:09:25 +01:00
LCastr0
1475243d8a Added MetalMan to the GUI for testings 2016-09-23 23:14:10 -03:00
Sam
f5a7f35d94 More kits 2016-09-23 18:58:14 +01:00
samczsun
187c6ec67c Remove debug messages 2016-09-22 21:25:40 -04:00
samczsun
548e23a212 Fix fetching timestamp from wrong column 2016-09-22 21:21:16 -04:00
Sam
f6acedba5f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-22 17:11:25 +01:00
Sam
2ba2b21577 Progress on converting SSM to a new cleaner system 2016-09-22 17:11:21 +01:00
Keir Nellyer
b24429783b Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-09-22 16:28:16 +01:00
Keir Nellyer
df17177892 PC-1003 Forgot to commit some changes from last commit 2016-09-22 16:10:31 +01:00
Keir Nellyer
ea74826d0c PC-1003 Prevent rogue Report objects being cached and cause handler message spam 2016-09-22 16:01:11 +01:00
Keir Nellyer
6494720d2e PC-998 Limit chat messages to 3 minutes 2016-09-22 15:48:01 +01:00
Shaun Bennett
79e6903c8b Enable Speed and Glide punishments, remove hack from ban reason 2016-09-22 08:44:58 -04:00
Shaun Bennett
7f447f8084 Setup compass for game changes 2016-09-22 00:33:48 -04:00
Shaun Bennett
a3d210871d Add ignored checks to GWEN (#211) 2016-09-21 23:21:02 -04:00
Shaun Bennett
e15804fc15 Prevent players from joining 1.9+ games with 1.8 clients (#212) 2016-09-21 23:19:55 -04:00
Shaun Bennett
9be26a92d1 Remove NCP 2016-09-21 22:21:49 -04:00
Sam
ac967f6b18 OITQP no longer in Beta (#210) 
* Convert OITQP into a module based system.

* More magic modules

* Achievements and Stats

* Achievement menu update

* Removed some Util methods I added that were never used.

* Missed a few things

* To Alex, Love Sam

* Gem and achievement kits
 2016-09-21 22:05:21 -04:00
Sarah
c1c46aceb8 Skyfall Game(#208) 
* basic prototype of the game Skyfall

* new crumble mechanic

* Developing basic game with basic mechanics and basic kits.

* Fix merge issues

* Add Supply Grop and Deathmatch and change map crumbling

* Make cosmetical changes for QA and add Stat Trackers and Achievements

* Add version requirement

* Change scoreboard layout

* Dont crumble the first island, but the islands over the spawn points

* Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava

* Unused imports

* Fix kit description, modify island crumbling and add ring damage

* Revert to normal crumble values

* Add Javadoc

* Remove more unused imports

* Check for material data on ring generation

* Add Block effect for Booster Ring recharge

* Unused imports...

* Add Elytra removal message and countdown

* "Fix" food issues and some other minor things

* Add chest refill to scoreboard from beginning

* Fix supply drop

* Unused imports.....

* Re-enable Anti Cheat

* Add java doc, remove system messages and add exeptions

* The end of the great label debate

* Fix method naming conventions

* Remove more labels

* Disable Booster kit
 2016-09-21 21:57:38 -04:00
samczsun
7252906d30 Better synchronization of Managers 2016-09-21 21:37:57 -04:00
samczsun
92a0d606d4 Fix timings 2016-09-21 21:37:57 -04:00
samczsun
ec4add259d Teleport players back to center of arcade lobby 2016-09-21 21:37:57 -04:00
Timothy Andis
bf61296948 PlayWire Ad integration (#207) 
* PlayWire integration.

* Tweak PlayWire display.
Update the GUI command.
Temp set cooldown to 10 seconds for testing *WILL BE REMOVED*

* PlayWire stuff.

* PlayWire streaks and tweaks.
 2016-09-21 21:24:58 -04:00
Keir Nellyer
1eecfbafee Small code improvement 2016-09-21 16:33:05 +01:00
Keir Nellyer
c6eb23812f PC-1001 Do not show private messages between users unless reporter is 
involved
 2016-09-21 13:21:23 +01:00
Keir Nellyer
09287ddefc PC-1002 Automatic reports bans show the id of the report which caused 
the ban
 2016-09-21 12:22:55 +01:00
Keir Nellyer
e73b06b5ab PC-998 Change cache time for chat messages to 5 minutes 2016-09-21 11:46:03 +01:00
Sam
209ea32ef9 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-20 09:18:20 +01:00
Keir Nellyer
32563904fa PC-997 Show total counts when showing report statistics 2016-09-19 10:38:03 +01:00
LCastr0
f0c7b1d6aa Whoops, forgot this 2016-09-18 16:18:33 -03:00
LCastr0
537dc28daa Used proper method to add specific prizes 2016-09-18 16:16:57 -03:00
LCastr0
ae6868b76a Added Witch Morph 
Added Metal Man morph
 2016-09-16 20:46:52 -03:00
Keir Nellyer
2cdab061b6 PC-886 Move report bans over to punishment gui 2016-09-16 17:40:14 +01:00
Keir Nellyer
ebe212c8ff Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-15 17:30:27 +01:00
William Burns
199d6cba3e Add a period to the anticheat ban message. (#206) 2016-09-14 20:50:08 -04:00
Alexander Meech
93c227a22d Change Mavs Basketball to 5 Minutes (#201) 
* Update ScoringManager.java
* Update Basketball.java
 2016-09-14 20:49:24 -04:00
Keir Nellyer
da5a8d5b46 PC-966 Reports assigned to RC now have a higher priority instead of no decay effect 2016-09-14 21:51:06 +01:00
Keir Nellyer
a64ba4db2a Include sender as being a recipient for testing reasons when checking if player can create a chat abuse report 2016-09-14 21:44:57 +01:00
Sam
1458cb84b9 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-14 20:14:05 +01:00
Keir Nellyer
9af606ae20 Ensure suspect messages actually involved the reporter 2016-09-14 14:53:39 +01:00
Keir Nellyer
efe532e8a6 Clean-up createReport method 2016-09-14 14:37:44 +01:00
Keir Nellyer
464099dc87 Correctly handle weird cases whereby an account may be involved in 
multiple open reports of the same category
 2016-09-14 14:26:12 +01:00
Keir Nellyer
2be0522599 Attach JavaDocs and small method renames 2016-09-14 14:14:11 +01:00
Keir Nellyer
425d814ac4 PC-966 When selecting a new report for a user to handle, always 
prioritise reports assigned to teams that the user is a member of
 2016-09-14 12:14:14 +01:00
Keir Nellyer
5ad4f2831d PC-966 Only allow members of team to handle report if team assigned 
to report
 2016-09-14 12:13:41 +01:00
Keir Nellyer
20c4488c5f PC-966 Add gui button for passing report to RC team 
Misc. other changes
 2016-09-13 18:28:09 +01:00
Keir Nellyer
d115097eb9 PC-966 Implement support for teams to be assigned to a report 2016-09-13 17:01:47 +01:00
Keir Nellyer
f1d1585585 PC-966 Implement method to get members of a team 2016-09-12 18:13:10 +01:00
Keir Nellyer
ee6e8a9656 PC-966 Implement report user cache 2016-09-12 18:07:01 +01:00
Keir Nellyer
a39d894d85 PC-966 Add support for saving report teams to database 2016-09-12 17:54:00 +01:00
Keir Nellyer
fae7e93f1a PC-966 Add support for loading report teams from database 2016-09-12 17:08:11 +01:00
Keir Nellyer
a5e5be4329 PC-951 Fix handler message task not being cancelled when closing report 2016-09-12 11:56:21 +01:00
Keir Nellyer
5e5cb3284a Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-12 10:11:31 +01:00
cnr
6de3640243 Disable immediate ban actions for Glide and Speed 2016-09-11 17:54:50 -05:00
LCastr0
36ce7ef222 Fixes for the Omega chest giving duplicated items (#202) 2016-09-10 23:05:29 -04:00
Connor James
454e1c8c11 AntiCheat 1.2 (#200) 
* Implement Anticheat 1.2 hooks

* Add default check thresholds for unknown check types

* Add violation level support for new checks

* Add ban waves for KillAura type D

* Amend DELETE_PENDING now that it's not hardcoded

* Add instant bans for high VL Glide/Speed

* Don't specify hack type in banwave ban message
 2016-09-10 23:01:13 -04:00
Sam
38473dcffd Fix metal taking too little damage with full iron (#203) 2016-09-10 22:47:52 -04:00
LCastr0
f6b06c63ac Fixes for the Omega chest giving duplicated items 2016-09-10 00:43:08 -03:00
AlexTheCoder
23a330d449 Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode 2016-09-08 03:50:45 -04:00
Shaun Bennett
e12ed35da1 Fix NPE and kit upgrades issue 2016-09-07 23:13:28 -04:00
Shaun Bennett
493086fcf3 Merge pull request #198 from Mineplex-LLC/update/developer-servers 
Update/developer servers
 2016-09-07 21:21:35 -04:00
Shaun Bennett
9318ba4de2 Merge branch 'develop' into bugfix/samczsun 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
 2016-09-07 20:12:57 -04:00
Shaun Bennett
7fbd6087eb Merge pull request #187 from Mineplex-LLC/update/oitq 
Skywars Update Patch
 2016-09-07 20:08:08 -04:00
samczsun
fba449ca03 Don't rearrange GUI if all dev servers are ingame 2016-09-07 19:17:47 -04:00
samczsun
a8adf23c15 Allow dev servers 2016-09-07 11:45:42 -04:00
Keir Nellyer
7b6f0ae221 PC-953 Make report ids in /reportstats command clickable 2016-09-07 16:40:05 +01:00
Sam
bed563876a Add a comment to explain usage of KitUpgradeShop 2016-09-07 14:18:07 +01:00
Shaun Bennett
ba322f0df1 Merge pull request #195 from Mineplex-LLC/update/emergency-support-fixes 
Update/emergency support fixes
 2016-09-07 07:57:53 -04:00
Shaun Bennett
b1b9900c9e Add offline stat checking 2016-09-07 07:47:19 -04:00
Keir Nellyer
e2840f36b5 PC-958 Don't allow chat abuse reports of players who haven't spoken 
in chat
 2016-09-07 11:28:20 +01:00
Keir Nellyer
640a8d3516 PC-958 Allow reporting of offline players 2016-09-07 09:50:10 +01:00
AlexTheCoder
225583a13d Remove join restrictions on beta servers from unranked players 2016-09-06 21:36:30 -04:00
Sam
5bf35d49db Message inconsistancy 2016-09-06 21:38:43 +01:00
Sam
be268991b0 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-06 21:37:33 +01:00
Sam
7a5a6c3d00 Fix duplicate message 2016-09-06 19:55:31 +01:00
Keir Nellyer
353cdb2413 Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2 2016-09-06 17:28:03 +01:00
Keir Nellyer
b1b275fc67 PC-958 Prepare codebase for reporting of offline players 2016-09-06 17:27:48 +01:00
Keir Nellyer
94b5a6e760 PC-952 Add /reportinfo 2016-09-06 16:43:51 +01:00
AlexTheCoder
64db10c91a Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes 2016-09-05 20:27:09 -04:00
AlexTheCoder
a124aa3d85 Fix items added via support server not showing up in customer service logs 2016-09-05 20:25:02 -04:00
samczsun
444fe5d151 Remove hacky reflection method to get server name 2016-09-05 18:37:17 -04:00
samczsun
08090f5e06 PC-818 
Seismic Charges can no longer remove barrier blocks
 2016-09-05 18:25:16 -04:00
samczsun
11c97691a9 PC-937 
This commit allows Arcade to consider spectating and vanished players when
deciding to autostart a game
 2016-09-05 18:25:16 -04:00
samczsun
6490ab3786 Don't hide banwave animation from staff 2016-09-05 18:25:16 -04:00
samczsun
3aaa9b2514 Sort tab list properly 2016-09-05 18:25:16 -04:00
samczsun
6b1d551a37 Remove please investigate 2016-09-05 18:25:16 -04:00
samczsun
0678f7287d No fake levels for those who don't want it 2016-09-05 18:25:16 -04:00
samczsun
d09b27bfe1 Fix disguises prevent join, join rank check bugs 2016-09-05 18:25:16 -04:00
samczsun
c18d771715 Unbreak Squid in SSM 2016-09-05 18:25:16 -04:00
Keir Nellyer
e2455bbc9d Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-05 20:04:12 +01:00
cnr
ccd81c1820 Fix BlockIgniteEvent NPE in MavericksManager 2016-09-05 13:42:24 -05:00
Sam
12130d41e6 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-05 17:59:51 +01:00
Sam
8ebaad4736 Beta ready commit 2016-09-05 17:59:49 +01:00
Keir Nellyer
acd63c90a1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-09-05 14:26:06 +01:00
AlexTheCoder
a7b0c9de05 Fix unnecessary calls to mysql/mssql databases in support server 2016-09-05 04:46:13 -05:00
AlexTheCoder
504432d87b Fix titan command not being registered 2016-09-05 04:46:01 -05:00
AlexTheCoder
9ce49b10c0 Add a command to allow support agents to check for ownership of internal sales packages 2016-09-05 04:45:51 -05:00
AlexTheCoder
ffb6073532 Fix unnecessary calls to mysql/mssql databases in support server 2016-09-04 23:44:54 -04:00
AlexTheCoder
b5771550ad Fix titan command not being registered 2016-09-04 23:28:25 -04:00
AlexTheCoder
866c3ee7c9 Add a command to allow support agents to check for ownership of internal sales packages 2016-09-04 22:11:05 -04:00
AlexTheCoder
29bb2a3895 Add an enjin chargeback command and fix punishing in support servers 2016-09-04 00:39:44 -05:00
AlexTheCoder
b3478d70e8 Update support packages 2016-09-04 00:39:44 -05:00
AlexTheCoder
5b80f3b6ac Fix clan banner being removed from support server information 2016-09-04 00:39:44 -05:00
AlexTheCoder
e2d3763ec0 Add an enjin chargeback command and fix punishing in support servers 2016-09-03 15:42:32 -04:00
Sam
34ee62bdc3 Fix NPE 2016-09-03 20:32:10 +01:00
AlexTheCoder
3088d79cf5 Update support packages 2016-09-03 15:16:59 -04:00
Sam
b3212fc003 Particle changes 2016-09-03 20:13:08 +01:00
Sam
4b1c93150b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 20:12:39 +01:00
Sam
8d5d0c6272 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 18:29:37 +01:00
Sam
c3c61b8189 Merge fix 2016-09-03 18:29:18 +01:00
Sam
fc0217f1fd More magic OITQ 2016-09-03 18:25:17 +01:00
Sam
e0424c78b2 Added spawn barrier 2016-09-03 18:24:56 +01:00
Sam
7eb148cc59 Ultimate colour change 2016-09-03 18:24:44 +01:00
AlexTheCoder
09a535466a Fix clan banner being removed from support server information 2016-09-03 11:37:45 -04:00
Shaun Bennett
e57d009341 Remove unused import! 2016-09-03 01:11:50 -04:00
Shaun Bennett
586a768c7b Fix enjin listener else bug 2016-09-03 00:59:15 -04:00
cnr
c9358d8c5a Add power play to support server 2016-09-02 19:10:30 -05:00
Keir Nellyer
a5efacc12f PC-955 Fix closing gui showing incorrect suspect name 2016-09-02 14:31:38 +01:00
cnr
2bce540c5d Disable Antihack in the staff server 2016-09-02 02:51:34 -05:00
cnr
374142e63f Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:42:51 -05:00
TadahTech
e2f974e1e6 Add sounds and messages to basketball. 2016-09-02 00:40:23 -05:00
cnr
ae0d30558c Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:12:12 -05:00
AlexTheCoder
9abbe1bfb9 Update support whitelist and op list 2016-09-02 00:10:36 -05:00
cnr
f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -05:00
cnr
71b880793f Implement power play logging and initial rewards 2016-09-02 00:01:49 -05:00
TadahTech
9e0bb6ff96 Tweak invite starting index. 
Disable NextBestGame in an MPS
 2016-09-01 20:59:28 -05:00
TadahTech
d8486abbfd Fix minor best game issues. 2016-09-01 20:05:53 -05:00
Keir Nellyer
78048ac279 PC-947 Add bypass for handling reports created or made against for developer 2016-09-01 18:21:50 +01:00
Keir Nellyer
d39dae748c PC-947 Don't allow staff members to handle reports created by or made against them 2016-09-01 17:55:36 +01:00
TadahTech
a6360249b7 Use party if a player has it. 2016-09-01 08:47:43 -05:00
TadahTech
6f3d7dcd29 Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have 2016-09-01 08:45:43 -05:00
TadahTech
41936e0efc Remove users from the map. 2016-09-01 08:31:16 -05:00
TadahTech
fdc54e1dd1 Fix BestGame not cancelling for parties. 2016-09-01 08:29:51 -05:00
cnr
05f640266f Fix basketball scoring infinite loop 2016-09-01 06:36:47 -05:00
TadahTech
107a296239 Fuck you intellij 2016-09-01 05:49:59 -05:00
TadahTech
53846acbf6 Dont let Minestrike use NextBestGame 2016-09-01 05:39:47 -05:00
TadahTech
9fcee07427 Fix people getting stuck in chests. 2016-09-01 05:34:37 -05:00
TadahTech
68743cf73c Mavs changes. 2016-09-01 03:24:38 -05:00
TadahTech
46053e82e1 Mavs changes. 2016-09-01 02:35:31 -05:00
TadahTech
c0c75ea375 Allow team selecting to work on the mavs hub. 2016-08-31 23:46:29 -05:00
cnr
9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
cnr
55086efd91 Merge branch 'feature/shadowmute' into develop 2016-08-31 23:16:57 -05:00
LCastr0
8e8719070c Changes Omega Chest to not be craftable 
Changes LockCosmetic and PowerPlay commands to be JNR_DEV+
 2016-08-31 23:26:41 -03:00
Sam
57292414c6 Gems for winners 2016-08-31 22:55:13 +01:00
Keir Nellyer
725892e93b PC-957 Show warning message when a user's report is marked as abusive 2016-08-31 16:38:35 +01:00
Keir Nellyer
8f28ab3f0d PC-949 /reportclose argument "<conclusion>" should be "<reason>" 2016-08-31 16:30:55 +01:00
Sam
0b7fdc01eb Initial balence change 2016-08-31 16:30:50 +01:00
Keir Nellyer
97e06053d1 PC-948 Don't send handler to server if they are already connected to it 2016-08-31 16:25:14 +01:00
Keir Nellyer
04432d44d7 This can be an in-line return 2016-08-31 15:04:15 +01:00
Sam
6a139d5c55 Tiny code improvement 2016-08-31 13:28:48 +01:00
Sam
7599630328 Pyromancer Ultimate name change 2016-08-31 13:27:07 +01:00
Sam
8d222aafec Fix increasing loop in Overtime 2016-08-31 13:26:54 +01:00
Sam
1bfebf358f Add Overtime 2016-08-31 12:07:50 +01:00
Sam
47df09b770 Handle null sound 2016-08-31 12:07:35 +01:00
Sam
b1faecea49 Kit Fire incorrect values 2016-08-31 12:07:25 +01:00
Keir Nellyer
41bae9d5f8 Add bottom margin so that big chat logs do not collide with footer 2016-08-31 10:45:38 +01:00
Keir Nellyer
a7d224b7e4 Fix reports duplicating themselves and causing massive issues 2016-08-30 23:18:12 +01:00
Keir Nellyer
96b74444e5 Fix duplicate message entries 2016-08-30 22:54:58 +01:00
AlexTheCoder
8397f53d39 Remove unneeded teleportation in clans hubs 2016-08-30 03:27:11 -04:00
AlexTheCoder
ba02dea404 Fix me being dumb 2016-08-30 03:22:55 -04:00
TadahTech
90ce21db3d Update preferences 2016-08-30 00:51:51 -05:00
AlexTheCoder
8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
TadahTech
a68f7395e4 Use proper server group / remove testing. 2016-08-30 00:10:38 -05:00
AlexTheCoder
5108a6f08d Convert to npc for entering mavericks lobby 2016-08-30 01:02:26 -04:00
AlexTheCoder
d7d8ef021e Disable using cosmetics inside mavericks hub 2016-08-30 00:47:48 -04:00
TadahTech
94bfc9aa15 Use proper server group / remove testing. 2016-08-29 22:33:01 -05:00
TadahTech
dfced7186f Finish tweaks for the hub 2016-08-29 22:32:07 -05:00
AlexTheCoder
463c03e9d1 Add pitch and yaw to npcs 2016-08-29 22:11:53 -04:00
Shaun Bennett
f72647e1d4 Merge with develop 2016-08-29 21:56:03 -04:00
Shaun Bennett
e7d876e865 Fix string.format param order 2016-08-29 21:33:00 -04:00
TadahTech
39ea280098 NextBestGame code and new hub releases 2016-08-29 20:21:36 -05:00
Alexander Meech
464c9fcdc3 Update steal chance 2016-08-29 20:37:02 -04:00
LCastr0
3687c7ad98 PowerPlayClub update 2016-08-29 21:32:11 -03:00
Shaun Bennett
f3e38031ab Add shadowmuting 2016-08-29 18:57:07 -04:00
Sam
7a3ce9813c Payload (OITQ) 2016-08-29 23:08:04 +01:00
Sam
9454e1f409 Skywars and Kit Progression 2016-08-29 23:07:48 +01:00
Keir Nellyer
b30f395d88 Update chat snap site for backend changes 2016-08-29 12:21:57 +01:00
Sam
ec8ed76270 Convert old perks to new perks 2016-08-28 09:06:07 +01:00
Sam
88f4813534 Perk related issue 2016-08-28 09:05:49 +01:00
Sam
ccd855da84 Name the ultimates 2016-08-28 09:05:31 +01:00
Sam
54e8f8e5e8 Code improvement and cleanup 2016-08-28 09:05:11 +01:00
Sam
34c6e1cab7 Add the base of kit progression 2016-08-28 09:04:46 +01:00
Sam
d81ed348f3 Remove used import 2016-08-28 09:04:09 +01:00
Keir Nellyer
022e9f6bd4 Players can have more than 1 active report open against them 2016-08-27 22:38:54 +01:00
Keir Nellyer
3f18c0cc6b Fix join/leave report handling 2016-08-27 22:35:12 +01:00
Keir Nellyer
cd9423a8e4 De-couple chatsnap from report system 2016-08-27 22:21:56 +01:00
Sam
a35c162dc4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-26 21:26:16 +01:00
Sam
efc14ee13f Another merge fix 2016-08-26 21:26:14 +01:00
Sam
4bc49e6133 Solve merge conflicts 2016-08-26 21:21:18 +01:00
LCastr0
3e38eb5990 Fixes to the merging conflicts 2016-08-25 20:13:59 -03:00
LCastr0
25d64c6dee Changes to lock command 2016-08-25 20:12:00 -03:00
Sam
c2344a0494 Magnet not giving the kill 2016-08-25 20:26:18 +01:00
Sam
265ab620e4 Fix Magnet affecting teams members 2016-08-25 20:10:13 +01:00
Sam
9c5ab7c67e Remove Fire Aspect 2 2016-08-25 20:09:50 +01:00
TadahTech
2a861460c6 Remove unused variables 2016-08-25 05:12:29 -05:00
TadahTech
b3b8f44b3a Fix perks not being registered. 2016-08-25 05:11:52 -05:00
TadahTech
f976f56fb7 Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update 2016-08-25 04:26:21 -05:00
TadahTech
ebfd00ebc3 Fix centering of the Preference Menu 2016-08-25 04:04:53 -05:00
TadahTech
f9cc505908 Minor tweaks to soccer fields 2016-08-25 04:02:17 -05:00
TadahTech
19cfcc414b Fix stacking minecarts 2016-08-25 03:58:39 -05:00
TadahTech
41b40fa12c Fix painting breaking. 2016-08-25 03:54:10 -05:00
cnr
8617572980 Fix preferences menu interaction in Clans{,Hub} 2016-08-25 02:26:42 -05:00
TadahTech
77e0090531 Tweak preferences 2016-08-25 00:17:31 -05:00
TadahTech
f518185518 Tweak parkour 2016-08-24 22:55:39 -05:00
TadahTech
1654850e8c Final Changes 2016-08-24 22:26:38 -05:00
TadahTech
ba2bee4f25 Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
 2016-08-24 21:29:01 -05:00
TadahTech
bca19788db Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
 2016-08-24 21:28:36 -05:00
cnr
352e1e0eb2 Merge branch 'update/skywars-finalised' into develop 2016-08-24 17:22:01 -05:00
cnr
df1fc60d3d Merge branch 'update/skywars-finalised' into develop 2016-08-24 17:12:58 -05:00
Sam
4088d2a311 Air teleportation fix 
Makes it less likey that a player would die of fall damage when using
the eye of ender
 2016-08-24 19:50:38 +01:00
Keir Nellyer
469a72afc0 JavaDocs 2016-08-23 16:40:25 +01:00
TadahTech
c9d14dc522 Update clans to new preferences. Remove debug messages. 2016-08-23 03:12:36 -05:00
TadahTech
bbe44e7d75 Remove debug. 2016-08-23 02:04:07 -05:00
TadahTech
02f703e68e Remove debug. 2016-08-23 01:57:39 -05:00
TadahTech
42c228773c Fix entity directions 2016-08-23 01:52:19 -05:00
TadahTech
3b9d6adfbc Lobby Update 2016-08-23 01:37:07 -05:00
Sam
2c37d17db3 Slight code change 2016-08-22 19:42:30 +01:00
Sam
e0f319ea09 Change kit internal names 
Changes the kit internal names to match the current skywars ones in
order so that kit progression experience is carried over during this
update.
 2016-08-22 17:28:51 +01:00
Keir Nellyer
dcfeaab5e1 Show invalid usage with alias used 2016-08-22 16:48:59 +01:00
Keir Nellyer
fb369d3df9 Add command to unban player from report system 2016-08-22 16:36:42 +01:00
Keir Nellyer
f805ceccdc Don't include aborted reports in report statistics 2016-08-22 16:07:14 +01:00
xGamingDudex
7fb6ff58d0 Moved gadgets to use a whitelist system instead of blacklist for 
collisions
 2016-08-22 01:00:29 +02:00
Sam
7db41a8be5 Reduce Earth kit scaling 2016-08-20 22:45:17 +01:00
Sam
28bbda23f5 Remove debug commands 2016-08-20 22:44:54 +01:00
Sam
e6530a6f44 More tweaks and fixes 2016-08-20 12:14:01 +01:00
xGamingDudex
e64324b36c Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-20 11:40:15 +02:00
Keir Nellyer
bde51e6a54 The server of the handler now handles sending periodic message, instead of it being done through Redis 
This also fixes server restarts breaking handler messages.
 2016-08-19 18:08:36 +01:00
Sam
dc5c2430cd Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-19 17:58:27 +01:00
Keir Nellyer
d05a69ac69 Fix handler message disappearing when changing server 2016-08-19 17:27:05 +01:00
Keir Nellyer
6367321315 Fix weird colouring 2016-08-19 17:26:08 +01:00
Keir Nellyer
eabaa1e68a Move limit statistic limit to query and sort returned results 2016-08-19 17:01:26 +01:00
Keir Nellyer
834e6b5fdf Switch to using UtilPlayer.message 2016-08-19 16:48:05 +01:00
Keir Nellyer
26aff936a0 Rename /reportstat command to /reportstats 2016-08-19 16:46:49 +01:00
Keir Nellyer
779efe3f47 Improve display of /reportstat 2016-08-19 16:46:25 +01:00
Keir Nellyer
bbb40a7b6e A report is considered expired once it's priority is < 1 2016-08-19 16:23:19 +01:00
Keir Nellyer
b6f0e84a02 Fix sql error when attempting to reinsert same report mapping 2016-08-19 16:21:44 +01:00
Keir Nellyer
2a62abfd33 Push chat snapshots at save time instead of handle time 2016-08-19 16:07:06 +01:00
Keir Nellyer
a1a604757b Remove old todo 2016-08-19 15:48:02 +01:00
Keir Nellyer
5b685a3a86 Fixed query for getting unhandled reports to behave well with abused reports 2016-08-19 15:46:59 +01:00
Keir Nellyer
2211e6c4ef Fix query for getting reports a user is handling to ignore aborted reports 2016-08-19 15:03:54 +01:00
Keir Nellyer
514757924d More descriptive message when aborting a report 2016-08-19 14:31:15 +01:00
Keir Nellyer
373c82c11b Fix query for getting unhandled reports 2016-08-19 14:30:59 +01:00
Keir Nellyer
ee78cf2bb9 Cancel messaging task if handler is no longer present 2016-08-19 14:30:24 +01:00
Keir Nellyer
10a6cbfe3b Remove handler from report object when aborting a report 2016-08-19 14:29:15 +01:00
Keir Nellyer
24d4da6aa2 Fix query to fetch report not fetching reports with no handler 2016-08-19 14:19:52 +01:00
Keir Nellyer
e6609d59c9 Fix incorrect MySQL operator 2016-08-19 14:01:17 +01:00
Sam
c4cb5d8db4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-19 12:56:24 +01:00
cnr
5365f1269f Delay Anticheat enable in Clans 
This ensure the anticheat has registered GameStartEvent before we fire
it
 2016-08-18 20:46:24 -05:00
cnr
72ddfd5d85 Disable server spawn radius in Clans 
Defer to the spawn claim area, instead
 2016-08-18 20:44:01 -05:00
LCastr0
84c6720d1c Fix merging errors 2016-08-18 18:30:32 -03:00
LCastr0
f4175ed724 Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D 2016-08-18 18:07:32 -03:00
Sam
3b11a2e985 Killstreaks 2016-08-18 22:02:33 +01:00
Keir Nellyer
b4ae149d89 Handlers can now abort a report allowing it to be handled by another 
member of staff
 2016-08-18 14:42:53 +01:00
cnr
a79fa9cd46 Update GWEN preference name to reflect its purpose 2016-08-18 01:59:31 -05:00
cnr
08e1b765f7 Send local Anticheat messages regardless of preference 2016-08-18 01:59:31 -05:00
cnr
78fe41a8af Update Anticheat ban message and duration 2016-08-18 01:59:30 -05:00
cnr
999237fe69 Accurately report game TPS 2016-08-18 01:59:05 -05:00
cnr
405f67f8b2 Implement/activate Anticheat phase two 
- Remove anticheat guardians from Arcade
- Uncomment/implement Anticheat phase two actions
  - Specifically: immediate ban on Kill Aura type A, VL 200.
- Give moderators less-specific messages, and limit messages by severity
 2016-08-17 23:23:20 -04:00
AlexTheCoder
c66e485c9e Fix arrow knockback 2016-08-17 23:22:30 -04:00
Sam
6c1bd88631 Increase passive knockback 2016-08-17 23:33:31 +01:00
Sam
1565b66395 Ore level changes 2016-08-17 23:33:17 +01:00
Sam
8d6e4a5fd3 Remove some unused code and cleanup 2016-08-17 22:28:22 +01:00
xGamingDudex
69275cb79c Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-17 20:57:18 +02:00
Keir Nellyer
3126d540e7 /reportstat command progress 2016-08-16 21:30:37 +01:00
Sam
0176f31f1e Complete implementation of kit progression 2016-08-16 18:55:26 +01:00
Keir Nellyer
3760166599 Remove remnants of old user report preference 2016-08-16 14:13:01 +01:00
Sam
604f5bc2cc Update to work with new scoreboard system 2016-08-16 11:03:12 +01:00
Sam
29a07c60ab Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-16 11:02:15 +01:00
Sam
84e5b38380 Testing session feedback 2016-08-16 10:53:37 +01:00
Sam
dac4d9595c Change scoreboard to use new system 2016-08-15 20:28:12 +01:00
Sam
6839006bd1 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-15 20:25:01 +01:00
Sam
d5d8f07085 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-08-15 19:21:56 +01:00
Sam
df606d5e07 Changed game logic to try out multiple round concept 2016-08-15 19:19:20 +01:00
Sam
09741d4d2a Added VersionModule (The new way to check client versions for games) 2016-08-15 19:18:51 +01:00
Sam
ea7d877d36 Some attempt at per player kits 2016-08-15 17:45:24 +01:00
cnr
08e65cb17e Implement MineplexLink spectator check 2016-08-14 17:40:28 -04:00
xGamingDudex
6e32906805 More Gadget Collision patches 2016-08-14 22:50:48 +02:00
xGamingDudex
045445791a Fixed gadget collision checks 2016-08-14 21:06:28 +02:00
xGamingDudex
e71cec874e Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-14 20:09:01 +02:00
Sam
8f4303cf39 Progress on Upgrade Details 2016-08-13 22:40:33 +01:00
Shaun Bennett
0f4f1a3582 Remove pointless try/catch 2016-08-13 01:39:56 -05:00
Shaun Bennett
c99a23d670 Add region and server to chat payload 2016-08-13 00:57:39 -05:00
Sam
33cb4db338 Minestrike - Stop vanished players being assigned teams on join 2016-08-12 19:52:23 +01:00
Sam
2915a5e3b9 Add mid-game kit changing NPCs 2016-08-11 21:16:49 +01:00
Sam
69fd78bbf2 Remove Shurikens 2016-08-11 19:05:13 +01:00
Shaun Bennett
a744566cd3 Add AntiSpam front end 2016-08-11 11:34:17 -05:00
Keir Nellyer
a8e891f247 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
 2016-08-11 14:53:57 +01:00
Sam
60a46c8c10 Fire burst is now instant 2016-08-11 14:26:25 +01:00
Keir Nellyer
5b516fd7bd Show player name in black if not suspect 2016-08-11 11:37:09 +01:00
Keir Nellyer
09b458af68 Mega-hack to remove unwanted whitespace (allowing the page to render 
correctly)
 2016-08-11 11:37:09 +01:00
Keir Nellyer
ebea70d078 Remove echo port debug line 2016-08-11 11:35:13 +01:00
Keir Nellyer
735eccca37 Move font styling over to stylesheet 2016-08-11 11:35:13 +01:00
cnr
4562b00dcb Repurpose MAC reports pref for GWEN reports 2016-08-11 04:01:14 -04:00
cnr
7b1ac5ded2 Merge branch 'update/clans' into develop 2016-08-10 21:27:43 -04:00
samczsun
7de9da3d1c Complete rework of disguising and antihack hook 
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.

Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.

Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines

The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
 2016-08-10 21:03:30 -04:00
Sam
82b2541e34 PC-827 
Team SSM - Teammates can no longer cancel each other's Blaze Firefly
 2016-08-10 21:47:13 +01:00
Sam
df646b0659 PC-897 
SG - Spectators can no longer punch fireballs from the world border
 2016-08-10 21:46:37 +01:00
Sam
a02699d84a PC-898 
SSM - Fixes an issue where kit armor would not appear correctly in your
inventory.
 2016-08-10 21:46:02 +01:00
Sam
933861176d PC-662 
Castle Siege - Fixes the game not ending if the whole of one team left.
 2016-08-10 21:45:27 +01:00
Sam
e05f90372a Add kit upgrade details 2016-08-10 19:05:40 +01:00
Keir Nellyer
ff7a427787 Handle party chat correctly 2016-08-10 16:57:44 +01:00
Keir Nellyer
cbdce80483 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-08-10 16:01:47 +01:00
xGamingDudex
907ac7473f Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-10 16:52:37 +02:00
Keir Nellyer
e43c241338 Display suspect username in red in chat log 2016-08-10 15:30:17 +01:00
Sam
87dd4c5632 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-08-09 20:23:58 +01:00
Sam
c19825cbb0 Remove unused imports 2016-08-09 20:23:50 +01:00
Alexander Meech
5fca64b86b Remove safezone requirement for observer mode 2016-08-09 15:10:45 -04:00
Keir Nellyer
84d7838e13 Allow setting of alternative MySQL port 2016-08-09 15:37:45 +01:00
Keir Nellyer
bc1265a828 Remove custom font on player ranks to match rest of site 2016-08-09 15:23:15 +01:00
Keir Nellyer
d627c6e98e Improve css styling slightly 2016-08-09 15:20:49 +01:00
Keir Nellyer
31800ee1e7 Colour suspect messages 2016-08-09 15:17:19 +01:00
Sam
950a46ad12 Fix Throwable Dirt's velocity 2016-08-09 14:06:39 +01:00
Sam
5fd5245978 Use attack name 2016-08-09 13:07:17 +01:00
Sam
95c23585c8 Missed a file 2016-08-09 12:53:54 +01:00
Sam
acd5e0c1d2 Added minecart colors 2016-08-09 12:53:34 +01:00
AlexTheCoder
e5a96e8189 Fix incorrect casing in mapping outposts 2016-08-08 21:54:27 -04:00
Sam
2f3ff052ff Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-08 22:59:55 +01:00
Sam
4c825cf80b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-08 22:48:33 +01:00
Sam
3bab7ffe44 Use attack name for Snowballs and Eggs 2016-08-08 22:48:13 +01:00
Sam
239761962d Now 1.9! 2016-08-08 20:49:24 +01:00
Keir Nellyer
6294e66484 Show report category on report site 2016-08-08 16:51:40 +01:00
Sam
93e49bc8a6 Stop placing and dropping of skill items 2016-08-08 16:44:13 +01:00
cnr
4180f03a52 Use the correct SalesPackageBase for gadgets 2016-08-07 22:40:26 -04:00
AlexTheCoder
5a2871528f Small aesthetic change to ghasts 2016-08-07 18:53:35 -04:00
AlexTheCoder
73cb42c7ab Make outposts actually end after they expire 2016-08-07 18:53:23 -04:00
AlexTheCoder
cce871b0e2 Stop runes being applied to stacks of items 2016-08-07 18:53:05 -04:00
AlexTheCoder
4e8ed68efd Stop bows from selling in stacks 2016-08-07 18:52:48 -04:00
AlexTheCoder
36e6c7ce33 Fix slight error in amplifier end messages 2016-08-07 18:52:21 -04:00
AlexTheCoder
e16d88e52b Add 'Safe' items replacing normal trapped chests and make craters not spam message when they explode 2016-08-07 18:52:00 -04:00
AlexTheCoder
5985731909 Make block drop rate 30% like normal TNT 2016-08-07 17:55:38 -04:00
AlexTheCoder
36aa1f9317 Stop swords and bows from being sold in stacks 2016-08-07 15:02:23 -04:00
AlexTheCoder
95302177f8 Add cooldowns to all gui items tied to giving rewards to prevent some exploitation 2016-08-07 14:47:14 -04:00
Sam
280ff577fa Metal Kit skill item placing and dropping 2016-08-07 01:25:48 +01:00
Sam
44274bcc64 Projectiles, Enchanted armor & StackOverFlows 
Fixes an issue where players with enchanted armor would cause the server
to frezze for an extended amount of time due to a stackoverflow error
when hit by projectiles such as snowballs or eggs.
 2016-08-07 01:23:03 +01:00
Sam
4173c96d32 Fixes inconsistency with the scoreboard 2016-08-06 23:56:54 +01:00
AlexTheCoder
c5d979e5dc Remove unnecessary while loop 2016-08-06 03:08:29 -04:00
AlexTheCoder
8eb74de2e8 Make outposts not try to block all right clicking everywhere -.- 2016-08-05 21:34:31 -04:00
Sam
691fc309c4 Documentation 2016-08-05 22:11:25 +01:00
Sam
e6bdfe8ba7 Per player fireworks 2016-08-05 22:11:15 +01:00
AlexTheCoder
4e0971ab0a Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-08-05 14:35:57 -04:00
AlexTheCoder
5b03692c97 Add in cooldowns for other clans shop buttons to stop autoclick exploits 2016-08-05 14:33:59 -04:00
AlexTheCoder
599c47a8c2 Prevent stacks of runes being consumed on one item 2016-08-05 14:33:21 -04:00
AlexTheCoder
a56f72b6af Unify standard for event spawn points 2016-08-05 14:32:30 -04:00
AlexTheCoder
4637bc8531 Prevent war times from displaying as negative 2016-08-05 14:31:13 -04:00
AlexTheCoder
223fb0e526 Use custom explosion calculations as opposed to default mineplex explosion handling 2016-08-05 14:30:00 -04:00
AlexTheCoder
d73ced0e87 Stop portals from spawning in mid-air 2016-08-05 14:28:49 -04:00
AlexTheCoder
6170f9df87 Actually enable create button by removing stray '!' 2016-08-05 14:27:07 -04:00
AlexTheCoder
027b6b3fc4 Prevent players from using /c home after recently being in combat 2016-08-05 14:25:47 -04:00
AlexTheCoder
ce6a0b376c Prevent players using the gui to bypass join cooldowns 2016-08-05 14:24:56 -04:00
AlexTheCoder
e01b57ceac Implement auto restart system for clans servers in off-peak times 2016-08-05 14:24:00 -04:00
AlexTheCoder
ee1f2a7ef9 Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611) 2016-08-05 14:22:17 -04:00
AlexTheCoder
1ab5c8229b Make bosses clean up after themselves and be more error-resistant 2016-08-05 13:40:05 -04:00
AlexTheCoder
14f140143b Re-enable music in hub gadgets 2016-08-05 13:34:33 -04:00
AlexTheCoder
bf7065732b Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have 2016-08-05 13:34:04 -04:00
Keir Nellyer
1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-08-05 17:05:01 +01:00
Sam
2c6fc85fee Logic fix and message change 2016-08-04 17:59:28 +01:00
cnr
0ca4fe2d38 Disable MAC kick for suspicious movement 2016-08-04 12:41:59 -04:00
Sam
618a132806 Payload path marker logic change 2016-08-04 17:29:40 +01:00
Sam
24c1e5fc3b Kit items are now unbreakable 2016-08-04 17:29:01 +01:00
Sam
23b7064d43 Island ores bug 2016-08-04 16:56:13 +01:00
Sam
190ced7d97 Metal Kit tweaks 2016-08-04 16:55:52 +01:00
xXVevzZXx
91cf391724 some adjustments to UHC Survivalgames 2016-08-04 00:33:24 -04:00
cnr
3610f78b37 Merge branch 'feature/thanks' into develop 2016-08-03 22:23:46 -04:00
Shaun Bennett
85c4c181ec Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl 2016-08-03 18:22:36 -05:00
Shaun Bennett
e113bedea5 Fix accidentally refactoring "thanks" in strings 2016-08-03 15:11:31 -05:00
Shaun Bennett
72f078fe54 Fix using wrong name, add missing jooq files 2016-08-03 15:04:06 -05:00
Shaun Bennett
6d93efc1a2 Adjust button text as well 2016-08-03 14:57:30 -05:00
Shaun Bennett
ad6c1dd970 Adjust some text wording 2016-08-03 14:55:33 -05:00
Shaun Bennett
2e80838376 Update ClaimTips lore 2016-08-03 14:25:07 -05:00
Shaun Bennett
a61906acfa Ignore "Testing" boostergroup when announcing activation 2016-08-03 14:24:49 -05:00
Shaun Bennett
ca13b8f29e Fix compile errors 2016-08-03 14:18:26 -05:00
Shaun Bennett
1ae7f6cb25 Integrate the new ThankManager into Amplifiers 2016-08-03 14:03:12 -05:00
cnr
3f0938815d Merge branch 'update/clans' into develop 2016-08-03 12:39:52 -04:00
AlexTheCoder
fb3cfecc79 Move recharge handler 2016-08-02 20:44:09 -04:00
Sam
2b8754aa32 Metal Kit bug fixes 2016-08-02 23:34:12 +01:00
Keir Nellyer
c327309a65 Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future 2016-08-02 16:46:14 +01:00
Shaun Bennett
f41cd8c104 Add /thank command. Update jooq files 2016-08-02 00:10:46 -05:00
md_5
dad453bd84 Remove Sentry - Unused 2016-08-02 11:42:16 +10:00
Sam
62a1968b01 Experimental Metal Kit 2016-08-02 01:13:16 +01:00
AlexTheCoder
4fdbb1fc9d Fix assorted bugs 2016-08-01 14:48:44 -04:00
Sam
bd00ac8446 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-01 19:34:40 +01:00
Sam
2c37af32ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-01 19:19:34 +01:00
Sam
4085453f0f Ninja Dash stopping/not working on rails 2016-08-01 18:47:17 +01:00
Sam
71f9fd97d6 End Effect change 
Reduced the amount of TNT thrown and reduced the velocity at which they
are fired.
 2016-08-01 18:46:35 +01:00
Sam
8f96b15454 Ninja Dash damage radius fix 2016-08-01 17:18:01 +01:00
Sam
84a4aa5157 Reduce Shuriken damage 2016-07-31 13:47:28 +01:00
Sam
1fde433c50 More changes and fixes 2016-07-30 22:53:36 +01:00
AlexTheCoder
cd237b8d3b Make players teleport to shops once they return to the nether 2016-07-30 17:42:57 -04:00
AlexTheCoder
d12d353c20 Fix pronoun in message autoreply 2016-07-30 17:36:03 -04:00
AlexTheCoder
2d39dbfb58 Move clans admin text 2016-07-30 17:34:03 -04:00
AlexTheCoder
fe92633802 Add claim limit override for admin claiming 2016-07-30 16:49:39 -04:00
AlexTheCoder
d1d366dcf8 Add a cooldown to clans shops to reduce chance of edge-case negative gold balances 2016-07-30 09:46:02 -04:00
AlexTheCoder
9e2ba8c653 Fix fissure applying to anvils 2016-07-30 09:36:38 -04:00
Sam
063e05c0f3 Move subtle changes and fixes 2016-07-29 19:07:24 +01:00
AlexTheCoder
ecb56bf450 Fix players being able to use de-blink to teleport between worlds 2016-07-29 13:35:09 -04:00
Keir Nellyer
635e07c5a2 This wasn't meant to be included in the last commit 2016-07-29 15:09:21 +01:00
Keir Nellyer
bb9dbf1da4 PC-877 Vanish report handler when teleporting to offender's server 2016-07-29 15:08:03 +01:00
Keir Nellyer
806ec2460a Add Gameplay report category for gameplay related reports 2016-07-29 13:20:06 +01:00
Keir Nellyer
43c94e95b3 PC-875 Players should only be banned after 3 abusive reports (currently is set to 1) 2016-07-29 12:58:08 +01:00
Keir Nellyer
9c76fec54e PC-874 Show label for report closure reason when closing a report 2016-07-29 12:56:14 +01:00
AlexTheCoder
96e0625548 Fix mislabeling of shop item in user display 2016-07-29 03:15:22 -04:00
cnr
d853f8467c Merge branch 'update/clans' into develop 2016-07-28 22:56:23 -05:00
TadahTech
9529789159 Remove 3 second chat delay. 2016-07-28 22:54:04 -05:00
AlexTheCoder
62e0a39ee8 Fix some medium graphics issues 2016-07-28 23:28:47 -04:00
cnr
8d0dc0ce08 Merge branch 'feature/party-v2' into develop 2016-07-28 21:19:52 -05:00
AlexTheCoder
f53503f16a Move code in sync runnable 2016-07-28 21:07:29 -04:00
AlexTheCoder
dddfb4420c Fix players being allowed to recall through worlds 2016-07-28 21:05:25 -04:00
AlexTheCoder
841a44b8a6 Make clan create button functional 2016-07-28 21:02:04 -04:00
AlexTheCoder
16804a860c Made duping usage for class shop impossible 2016-07-28 20:22:30 -04:00
AlexTheCoder
97d5d21a55 Fix lightning orb duping 2016-07-28 19:43:43 -04:00
AlexTheCoder
853fe31fbe Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-28 19:11:39 -04:00
AlexTheCoder
3aad06cc8a Make Clans displayed as FULL instead of BETA in server compass 2016-07-28 19:11:14 -04:00
AlexTheCoder
47d79bbad5 Fix bugs arising during clans release 2016-07-28 19:08:47 -04:00
AlexTheCoder
f3944527f8 Display clans purchases properly in support server 2016-07-28 19:08:24 -04:00
LCastr0
ab8d6daa2c GitHub being annoying again 2016-07-28 19:59:49 -03:00
Sam
9b71f8c30b Typo in KitBarrage 2016-07-28 22:49:58 +01:00
Sam
6c11037460 First QA testing session feedback 2016-07-28 22:39:05 +01:00
LCastr0
ab52965e44 Power Play button inside Carl, and the power play manager 2016-07-28 18:07:10 -03:00
Sam
771f643b42 Jumping disabled during Pyromancer ULT 2016-07-28 21:01:29 +01:00
cnr
a498bc13db Reinstate async wrappers for clans gold access 2016-07-28 14:59:43 -05:00
Sam
446aec5187 Add "for Team X" when picking up the Arrow powerup 2016-07-28 20:19:50 +01:00
Sam
ba03051689 Add 1 second respawn delay 2016-07-28 19:33:16 +01:00
Sam
d30703c570 Completed game logic & Kit fixes 2016-07-28 19:31:15 +01:00
Shaun Bennett
9c42f4c147 Use the proper boostergroup for amplifier thanks 2016-07-28 13:27:48 -05:00
Keir Nellyer
5dd35d45c4 PC-873 Alert user regardless of usage if banned from using /report 2016-07-28 17:41:20 +01:00
Keir Nellyer
8ee6ab6a1b Display message to reporters of a report when it is closed 2016-07-28 17:17:12 +01:00
AlexTheCoder
f0be7794f5 Lower skeleton king passive rate 2016-07-28 06:16:20 -04:00
AlexTheCoder
4efe1fe76d Make boss portals open where the boss spawned 2016-07-28 05:46:26 -04:00
AlexTheCoder
c30d30b2e7 Fixes event mobs getting stuck outside 2016-07-28 05:33:37 -04:00
TadahTech
ab9bf2f405 Fixes possible bug with party leaders not seeing chat. 
Adds pling when you received an invite.
 2016-07-28 03:40:24 -05:00
AlexTheCoder
639e089901 Disable clans tutorial 2016-07-28 04:28:34 -04:00
AlexTheCoder
aef94e13a8 Fix message not being sent 2016-07-28 04:18:29 -04:00
AlexTheCoder
b718a72366 Fix shop chunk size being too small for map 2016-07-28 02:59:03 -04:00
cnr
dd38a1dd76 Merge branch 'update/clans' into develop 2016-07-27 20:40:35 -05:00
AlexTheCoder
d5a1312c48 Update border size to match new map 2016-07-27 20:46:40 -04:00
cnr
05e59ae9cc Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"" 
This reverts commit 917b83250d.
 2016-07-27 19:03:04 -05:00
Sam
00c0e38b82 Kit upgrades now display 2016-07-27 23:02:40 +01:00
xXVevzZXx
749fa36a5a remove debug and check for Integer class 2016-07-27 16:47:08 -05:00
cnr
646ce96250 Ensure gold balance row is present 2016-07-27 16:15:03 -05:00
AlexTheCoder
62871686b0 Update clans store items to currency changes 2016-07-27 16:57:07 -04:00
cnr
dfbebe11f4 Use separate gold balances for each clans server 2016-07-27 15:52:07 -05:00
AlexTheCoder
031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
AlexTheCoder
6180bea5cc Update clans drop aesthetics and spawn/shop locations 2016-07-27 15:07:11 -04:00
xXVevzZXx
43c45f4094 add timer to dragon escape 2016-07-27 13:59:35 -05:00
Sam
8648581140 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-27 19:57:25 +01:00
Sam
ee38cb4c39 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-27 19:56:36 +01:00
Sam
888d3fb1aa Payload logic progress 2016-07-27 19:56:31 +01:00
cnr
167c0f2b5e Reimplement EnergyShopButton with new machinery 2016-07-27 13:52:03 -05:00
cnr
3cddf35d12 Refactor out legacy ConfirmationPage 2016-07-27 13:52:03 -05:00
cnr
3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00