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

9196 Commits

Author SHA1 Message Date
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