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

9031 Commits

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