Commit Graph

9475 Commits

Author SHA1 Message Date
AlexTheCoder 4fc2b875d4 Add a clans map generator to codebase 2016-11-16 22:37:25 -05:00
AlexTheCoder a219a2d072 Fix TNT breaking bedrock, increase build height and add a minimum chest place height 2016-11-16 22:37:25 -05:00
AlexTheCoder 1535fcc38b Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks 2016-11-16 22:37:25 -05:00
AlexTheCoder 63ef68976c Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective 2016-11-16 22:37:25 -05:00
Sam 22b7ce60eb For sam 2016-11-17 02:56:58 +00:00
Alexander Meech c21e71606d Fix message line spacing for Prince Artix 2016-11-16 21:42:47 -05:00
AlexTheCoder b374d728f5 Change playwire button, modify player messages, and fix availability bugs 2016-11-16 21:42:47 -05:00
AlexTheCoder 0070fed6c7 Fix playwire multithreading and convert to new 5-ticket per 24-hour system 2016-11-16 21:42:47 -05:00
AlexTheCoder 824ef685c0 Add missing return 2016-11-16 21:42:47 -05:00
AlexTheCoder d5f89bb370 Add more blocked commands and move the blocked command handler below the Mineplex command executor 2016-11-16 21:42:47 -05:00
AlexTheCoder 4cb257e84a Tweak blocked commands system 2016-11-16 21:42:47 -05:00
Sam Sun 4709161180 Attempt to fix CTF Proxies (#280) 2016-11-16 21:40:42 -05:00
md-5 735550c157 Use Mineplex Pair Util Class in Halloween 2016 (#274)
JavaFX is not included in OpenJDK.
2016-11-16 20:29:33 -05:00
Shaun Bennett 0039b79281 Change Youtube Button Link (#275)
* Fix possible NPE in Preferences

* Change youtube button link
2016-11-16 20:23:14 -05:00
Sam 8d6eb13504 Add "%player% is your teammate" in 2 player team games (#273)
* Add "%player% is your teammate" in 2 player team games

* Add to Team Skyfall
2016-11-16 20:10:16 -05:00
Sam 684432d7dc Add Rules Command (#272)
* Added a /rules command

* Remove unused space

* More Spaces!
2016-11-16 19:59:24 -05:00
Sam 51c7801a9f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-15 20:01:21 +00:00
cnr 70ca2c7964 Add 1.11 support 2016-11-15 13:58:31 -06:00
Sam faba1f2369 Forgot the actual UHC class... 2016-11-13 12:35:48 +00:00
Sam efc73d220f Change how UHC handles time 2016-11-13 12:35:38 +00:00
Sam 07cd716cf7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-13 10:37:21 +00:00
Sam aa4ef9f4ad Big bugs 2016-11-12 21:50:38 +00:00
Keir Nellyer 6e5db69b0c Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-10 13:52:44 +00:00
Sarah e71187aa33 Add new Brawl Games (#260)
* add more Brawl games

* fix some bugs in new brawl games

* fix even more bugs

* Fix some super paintstrike bugs

* Add some Javadoc
2016-11-09 20:38:49 -05:00
Keir Nellyer af7557c9b1 When multiple accounts with the same name occur, pick the one that
logged in most recently
2016-11-09 01:25:33 +00:00
Nate Mortensen 3b83a9bdc3 Reformat Block Hunt 2016-11-08 10:44:39 -05:00
Nate Mortensen 6db79c3ca5 Remove disguises when players switch to Seeker 2016-11-08 10:44:39 -05:00
Nate Mortensen 0607355ee0 Prevent cloaked players from having their visibility reset 2016-11-08 10:44:39 -05:00
Nate Mortensen e3b701f948 Don't give infestors an initial disguise 2016-11-08 10:44:39 -05:00
Keir Nellyer 6273996ebe Only set incognito and teleport player when report is hacking or
gameplay offense
2016-11-07 15:38:55 +00:00
Sam 6a9648e646 Solo Mode and Faster UHC 2016-11-05 11:06:12 +00:00
xXVevzZXx af7de62ff7 Fix non upgradeable perks being not unregistered 2016-11-04 06:02:13 -05:00
Keir Nellyer 407ec0d924 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-03 20:11:21 +00:00
xXVevzZXx d93cdfee8f Add Team stats display for Skyfall 2016-11-02 21:42:53 -05:00
Nate Mortensen f587445ffc Remove extraneous horses when the game ends
When players using the horseman kit win a game,
they never die, which is the only time that spawned
horses are removed.  To fix this, at the end of the
game all horses belonging to players that have survived
are explicitly removed, which removes all remaining horses.
2016-11-02 17:01:17 -04:00
LCastr0 9267a36528 Disable Halloween 2016 (#261)
* Removed all the halloween related items:
 - Haunted chests can only be opened if player already had ammo
 - Removed Halloween theme from the hub
 - Removed pumpkins from in-game

* Added Halloween items to the Omega Chest

* Fixed weight for items in the omega chest

* Changed Disk to Disc in RewardManager
Changed values for omega rarities

* Final commit (removed win room test command)

* Removed Halloween words from Draw My Thing and Master Builders
2016-11-02 16:49:31 -04:00
Sarah afac2aea3f Skyfall Update (#262)
* Fix some bugs, improve Skyfall and add Skyfall Teams

* re-enable debug

* Fix Perks not being unregistered from the EventHandler

* Remove unused import

* Remove unused imports
2016-11-02 16:48:44 -04:00
Sam b122fba97e Fix arrows not getting removed! 2016-11-02 16:48:01 -04:00
Alexander Meech 1f69c204f6 Fix Trick or Treat Chest Logging in Cust Server 2016-11-02 16:47:38 -04:00
Alexander Meech e73947b9b1 Hotfix pumpling pet being added to Haunted Chest 2016-11-02 16:47:38 -04:00
Keir Nellyer aaa248833e Don't allow players to have more than 5 open snapshots at a time 2016-11-01 17:21:56 +00:00
Keir Nellyer 828f39536b Don't allow players to have more than 5 open reports at a time 2016-10-31 15:49:15 +00:00
Keir Nellyer b5ef642f39 Improve getReportHandling code 2016-10-30 22:13:52 +00:00
Keir Nellyer 4971adcfb3 This should be an inner join 2016-10-30 01:53:52 +00:00
Keir Nellyer e72573d6fd Fix getReports method not checking report cache first 2016-10-30 01:41:28 +00:00
Keir Nellyer 8f07d377f1 Clear report cache after closing message has been sent, prevents
report cache being cleared and instantly reloaded
2016-10-30 01:25:06 +00:00
Keir Nellyer 1405aef0c3 Update code to use column `creatorId` instead of `creator` 2016-10-30 01:16:40 +00:00
Keir Nellyer 08f113bb99 Various improvements and fixes to report related database queries 2016-10-30 01:58:56 +01:00
Keir Nellyer ce4672f026 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-29 15:54:13 +01:00
Keir Nellyer 7aa3daca9d PC-1140 Fix various issues with region-locked reports 2016-10-29 15:54:01 +01:00
Keir Nellyer 696a99b872 Refactor some parameter names to make method function more obvious 2016-10-29 15:26:02 +01:00
Keir Nellyer 3dc441d61d PC-1016 Delete snapshots > 30 days and not linked to report in
cleanup task
2016-10-29 14:38:16 +01:00
Keir Nellyer 09e5d13b96 PC-1016 Rename column `creator` to `creatorId` 2016-10-29 14:27:19 +01:00
Keir Nellyer eb37c5da2e PC-1016 Create column `created` to store date time for snapshots 2016-10-29 14:26:16 +01:00
samczsun 07c93606f8 GameChatManager: Check if the game exists 2016-10-28 17:57:25 -04:00
samczsun 873e93747e HolidayManager: Fix CME 2016-10-28 17:57:25 -04:00
samczsun 49c5df6e68 Parties: Check if target is null before inviting 2016-10-28 17:57:25 -04:00
samczsun 1d961c7d81 GamePlayerManager: Don't load kits if offline 2016-10-28 17:57:25 -04:00
samczsun a7986a0719 Party: Fix NPE
Filter out members who are no longer online when sending messages
2016-10-28 17:57:25 -04:00
samczsun d2a2fdfd46 UHC: Fix NPE
Players who joined after the gamestate has been set to PREPARE
should not be considered as in the game
2016-10-28 17:57:25 -04:00
samczsun a729b03ce7 UtilParser: Handle null lastDamageCauses 2016-10-28 17:57:25 -04:00
samczsun 0c1f6cbedc Rewrite CombatLogModule 2016-10-28 17:57:25 -04:00
samczsun 70ed2e4fbb CompassModule
Integrate with CombatLogModule
2016-10-28 17:56:46 -04:00
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