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

9589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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