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

3434 Commits

Author SHA1 Message Date
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
Shaun Bennett
a3d210871d Add ignored checks to GWEN (#211) 2016-09-21 23:21:02 -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
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
LCastr0
f6b06c63ac Fixes for the Omega chest giving duplicated items 2016-09-10 00:43:08 -03:00
Shaun Bennett
e12ed35da1 Fix NPE and kit upgrades issue 2016-09-07 23:13:28 -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
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
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
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
samczsun
444fe5d151 Remove hacky reflection method to get server name 2016-09-05 18:37:17 -04:00
samczsun
6490ab3786 Don't hide banwave animation from staff 2016-09-05 18:25:16 -04:00
samczsun
6b1d551a37 Remove please investigate 2016-09-05 18:25:16 -04:00
samczsun
0678f7287d No fake levels for those who don't want it 2016-09-05 18:25:16 -04:00
samczsun
d09b27bfe1 Fix disguises prevent join, join rank check bugs 2016-09-05 18:25:16 -04:00
samczsun
c18d771715 Unbreak Squid in SSM 2016-09-05 18:25:16 -04:00
Sam
12130d41e6 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-05 17:59:51 +01:00
Keir Nellyer
acd63c90a1 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/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-09-05 14:26:06 +01:00
AlexTheCoder
29bb2a3895 Add an enjin chargeback command and fix punishing in support servers 2016-09-04 00:39:44 -05:00
Sam
b3212fc003 Particle changes 2016-09-03 20:13:08 +01:00
Sam
4b1c93150b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 20:12:39 +01:00
Sam
8d5d0c6272 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 18:29:37 +01:00
Sam
c3c61b8189 Merge fix 2016-09-03 18:29:18 +01:00
cnr
c9358d8c5a Add power play to support server 2016-09-02 19:10:30 -05:00
Keir Nellyer
a5efacc12f PC-955 Fix closing gui showing incorrect suspect name 2016-09-02 14:31:38 +01:00
cnr
ae0d30558c Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:12:12 -05:00
cnr
f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -05:00
cnr
71b880793f Implement power play logging and initial rewards 2016-09-02 00:01:49 -05:00
TadahTech
9e0bb6ff96 Tweak invite starting index. 
Disable NextBestGame in an MPS
 2016-09-01 20:59:28 -05:00
Keir Nellyer
78048ac279 PC-947 Add bypass for handling reports created or made against for developer 2016-09-01 18:21:50 +01:00
Keir Nellyer
d39dae748c PC-947 Don't allow staff members to handle reports created by or made against them 2016-09-01 17:55:36 +01:00
TadahTech
9fcee07427 Fix people getting stuck in chests. 2016-09-01 05:34:37 -05:00
cnr
9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
cnr
55086efd91 Merge branch 'feature/shadowmute' into develop 2016-08-31 23:16:57 -05:00
LCastr0
8e8719070c Changes Omega Chest to not be craftable 
Changes LockCosmetic and PowerPlay commands to be JNR_DEV+
 2016-08-31 23:26:41 -03:00
Keir Nellyer
725892e93b PC-957 Show warning message when a user's report is marked as abusive 2016-08-31 16:38:35 +01:00
Keir Nellyer
8f28ab3f0d PC-949 /reportclose argument "<conclusion>" should be "<reason>" 2016-08-31 16:30:55 +01:00
Keir Nellyer
97e06053d1 PC-948 Don't send handler to server if they are already connected to it 2016-08-31 16:25:14 +01:00
Keir Nellyer
04432d44d7 This can be an in-line return 2016-08-31 15:04:15 +01:00
Keir Nellyer
a7d224b7e4 Fix reports duplicating themselves and causing massive issues 2016-08-30 23:18:12 +01:00
Keir Nellyer
96b74444e5 Fix duplicate message entries 2016-08-30 22:54:58 +01:00
AlexTheCoder
ba02dea404 Fix me being dumb 2016-08-30 03:22:55 -04:00
TadahTech
90ce21db3d Update preferences 2016-08-30 00:51:51 -05:00
AlexTheCoder
8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
TadahTech
a68f7395e4 Use proper server group / remove testing. 2016-08-30 00:10:38 -05:00
TadahTech
dfced7186f Finish tweaks for the hub 2016-08-29 22:32:07 -05:00
AlexTheCoder
463c03e9d1 Add pitch and yaw to npcs 2016-08-29 22:11:53 -04:00
Shaun Bennett
f72647e1d4 Merge with develop 2016-08-29 21:56:03 -04:00
Shaun Bennett
e7d876e865 Fix string.format param order 2016-08-29 21:33:00 -04:00
TadahTech
39ea280098 NextBestGame code and new hub releases 2016-08-29 20:21:36 -05:00