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
dae3c60247
Commit Graph

9012 Commits

Author SHA1 Message Date
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
samczsun
444fe5d151 Remove hacky reflection method to get server name 2016-09-05 18:37:17 -04:00
samczsun
08090f5e06 PC-818 
Seismic Charges can no longer remove barrier blocks
 2016-09-05 18:25:16 -04:00
samczsun
11c97691a9 PC-937 
This commit allows Arcade to consider spectating and vanished players when
deciding to autostart a game
 2016-09-05 18:25:16 -04:00
samczsun
6490ab3786 Don't hide banwave animation from staff 2016-09-05 18:25:16 -04:00
samczsun
3aaa9b2514 Sort tab list properly 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
Keir Nellyer
e2455bbc9d Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-05 20:04:12 +01:00
cnr
ccd81c1820 Fix BlockIgniteEvent NPE in MavericksManager 2016-09-05 13:42:24 -05:00
Sam
12130d41e6 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-05 17:59:51 +01:00
Sam
8ebaad4736 Beta ready commit 2016-09-05 17:59:49 +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
a7b0c9de05 Fix unnecessary calls to mysql/mssql databases in support server 2016-09-05 04:46:13 -05:00
AlexTheCoder
504432d87b Fix titan command not being registered 2016-09-05 04:46:01 -05:00
AlexTheCoder
9ce49b10c0 Add a command to allow support agents to check for ownership of internal sales packages 2016-09-05 04:45:51 -05:00
AlexTheCoder
ffb6073532 Fix unnecessary calls to mysql/mssql databases in support server 2016-09-04 23:44:54 -04:00
AlexTheCoder
b5771550ad Fix titan command not being registered 2016-09-04 23:28:25 -04:00
AlexTheCoder
866c3ee7c9 Add a command to allow support agents to check for ownership of internal sales packages 2016-09-04 22:11:05 -04:00
AlexTheCoder
29bb2a3895 Add an enjin chargeback command and fix punishing in support servers 2016-09-04 00:39:44 -05:00
AlexTheCoder
b3478d70e8 Update support packages 2016-09-04 00:39:44 -05:00
AlexTheCoder
5b80f3b6ac Fix clan banner being removed from support server information 2016-09-04 00:39:44 -05:00
AlexTheCoder
e2d3763ec0 Add an enjin chargeback command and fix punishing in support servers 2016-09-03 15:42:32 -04:00
Sam
34ee62bdc3 Fix NPE 2016-09-03 20:32:10 +01:00
AlexTheCoder
3088d79cf5 Update support packages 2016-09-03 15:16:59 -04: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
Sam
fc0217f1fd More magic OITQ 2016-09-03 18:25:17 +01:00
Sam
e0424c78b2 Added spawn barrier 2016-09-03 18:24:56 +01:00
Sam
7eb148cc59 Ultimate colour change 2016-09-03 18:24:44 +01:00
AlexTheCoder
09a535466a Fix clan banner being removed from support server information 2016-09-03 11:37:45 -04:00
Shaun Bennett
e57d009341 Remove unused import! 2016-09-03 01:11:50 -04:00
Shaun Bennett
586a768c7b Fix enjin listener else bug 2016-09-03 00:59:15 -04: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
2bce540c5d Disable Antihack in the staff server 2016-09-02 02:51:34 -05:00
cnr
374142e63f Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:42:51 -05:00
TadahTech
e2f974e1e6 Add sounds and messages to basketball. 2016-09-02 00:40:23 -05:00
cnr
ae0d30558c Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:12:12 -05:00
AlexTheCoder
9abbe1bfb9 Update support whitelist and op list 2016-09-02 00:10:36 -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
TadahTech
d8486abbfd Fix minor best game issues. 2016-09-01 20:05:53 -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
a6360249b7 Use party if a player has it. 2016-09-01 08:47:43 -05:00
TadahTech
6f3d7dcd29 Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have 2016-09-01 08:45:43 -05:00
TadahTech
41936e0efc Remove users from the map. 2016-09-01 08:31:16 -05:00
TadahTech
fdc54e1dd1 Fix BestGame not cancelling for parties. 2016-09-01 08:29:51 -05:00
cnr
05f640266f Fix basketball scoring infinite loop 2016-09-01 06:36:47 -05:00
TadahTech
107a296239 Fuck you intellij 2016-09-01 05:49:59 -05:00
TadahTech
53846acbf6 Dont let Minestrike use NextBestGame 2016-09-01 05:39:47 -05:00
TadahTech
9fcee07427 Fix people getting stuck in chests. 2016-09-01 05:34:37 -05:00
TadahTech
68743cf73c Mavs changes. 2016-09-01 03:24:38 -05:00
TadahTech
46053e82e1 Mavs changes. 2016-09-01 02:35:31 -05:00
TadahTech
c0c75ea375 Allow team selecting to work on the mavs hub. 2016-08-31 23:46:29 -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
Sam
57292414c6 Gems for winners 2016-08-31 22:55:13 +01: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
Sam
6a139d5c55 Tiny code improvement 2016-08-31 13:28:48 +01:00
Sam
7599630328 Pyromancer Ultimate name change 2016-08-31 13:27:07 +01:00
Sam
8d222aafec Fix increasing loop in Overtime 2016-08-31 13:26:54 +01:00
Sam
1bfebf358f Add Overtime 2016-08-31 12:07:50 +01:00
Sam
47df09b770 Handle null sound 2016-08-31 12:07:35 +01:00
Sam
b1faecea49 Kit Fire incorrect values 2016-08-31 12:07:25 +01:00
Keir Nellyer
41bae9d5f8 Add bottom margin so that big chat logs do not collide with footer 2016-08-31 10:45:38 +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
8397f53d39 Remove unneeded teleportation in clans hubs 2016-08-30 03:27:11 -04: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
AlexTheCoder
5108a6f08d Convert to npc for entering mavericks lobby 2016-08-30 01:02:26 -04:00
AlexTheCoder
d7d8ef021e Disable using cosmetics inside mavericks hub 2016-08-30 00:47:48 -04:00
TadahTech
94bfc9aa15 Use proper server group / remove testing. 2016-08-29 22:33:01 -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
Alexander Meech
464c9fcdc3 Update steal chance 2016-08-29 20:37:02 -04:00
LCastr0
3687c7ad98 PowerPlayClub update 2016-08-29 21:32:11 -03:00
Shaun Bennett
f3e38031ab Add shadowmuting 2016-08-29 18:57:07 -04:00
Sam
7a3ce9813c Payload (OITQ) 2016-08-29 23:08:04 +01:00
Sam
9454e1f409 Skywars and Kit Progression 2016-08-29 23:07:48 +01:00
Keir Nellyer
b30f395d88 Update chat snap site for backend changes 2016-08-29 12:21:57 +01:00
Sam
ec8ed76270 Convert old perks to new perks 2016-08-28 09:06:07 +01:00
Sam
88f4813534 Perk related issue 2016-08-28 09:05:49 +01:00
Sam
ccd855da84 Name the ultimates 2016-08-28 09:05:31 +01:00
Sam
54e8f8e5e8 Code improvement and cleanup 2016-08-28 09:05:11 +01:00
Sam
34c6e1cab7 Add the base of kit progression 2016-08-28 09:04:46 +01:00
Sam
d81ed348f3 Remove used import 2016-08-28 09:04:09 +01:00
Keir Nellyer
022e9f6bd4 Players can have more than 1 active report open against them 2016-08-27 22:38:54 +01:00
Keir Nellyer
3f18c0cc6b Fix join/leave report handling 2016-08-27 22:35:12 +01:00
Keir Nellyer
cd9423a8e4 De-couple chatsnap from report system 2016-08-27 22:21:56 +01:00
Sam
a35c162dc4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-26 21:26:16 +01:00
Sam
efc14ee13f Another merge fix 2016-08-26 21:26:14 +01:00
Sam
4bc49e6133 Solve merge conflicts 2016-08-26 21:21:18 +01:00
LCastr0
3e38eb5990 Fixes to the merging conflicts 2016-08-25 20:13:59 -03:00
LCastr0
25d64c6dee Changes to lock command 2016-08-25 20:12:00 -03:00
Sam
c2344a0494 Magnet not giving the kill 2016-08-25 20:26:18 +01:00
Sam
265ab620e4 Fix Magnet affecting teams members 2016-08-25 20:10:13 +01:00
Sam
9c5ab7c67e Remove Fire Aspect 2 2016-08-25 20:09:50 +01:00
TadahTech
2a861460c6 Remove unused variables 2016-08-25 05:12:29 -05:00
TadahTech
b3b8f44b3a Fix perks not being registered. 2016-08-25 05:11:52 -05:00
TadahTech
f976f56fb7 Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update 2016-08-25 04:26:21 -05:00
TadahTech
ebfd00ebc3 Fix centering of the Preference Menu 2016-08-25 04:04:53 -05:00
TadahTech
f9cc505908 Minor tweaks to soccer fields 2016-08-25 04:02:17 -05:00
TadahTech
19cfcc414b Fix stacking minecarts 2016-08-25 03:58:39 -05:00