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

3425 Commits

Author SHA1 Message Date
Shaun Bennett 25000f7367 Merge pull request #226 from Mineplex-LLC/bugfix/report-hotfix 
Report feature hotfixes
 2016-10-05 17:13:08 -04: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
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
Keir Nellyer 17b04a6a84 PC-1021 Prevent 'null' player being punished 2016-10-03 10:00:04 +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
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
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 dd5a284d55 Print stacktrace when unable to fetch report player is handling 2016-09-30 00:29:57 +01:00
Shaun Bennett 9d6985ddcd Fix MPS zip file name, null amp stand 2016-09-29 09:10:25 -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
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
samczsun b35d933e56 Fix PlayWire error, handle future errors properly 2016-09-25 16:28:02 -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
LCastr0 1475243d8a Added MetalMan to the GUI for testings 2016-09-23 23:14:10 -03: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
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