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
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
9454e1f409
Skywars and Kit Progression
2016-08-29 23:07:48 +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
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
TadahTech
b3b8f44b3a
Fix perks not being registered.
2016-08-25 05:11:52 -05:00
TadahTech
ebfd00ebc3
Fix centering of the Preference Menu
2016-08-25 04:04:53 -05:00
TadahTech
41b40fa12c
Fix painting breaking.
2016-08-25 03:54:10 -05:00
TadahTech
77e0090531
Tweak preferences
2016-08-25 00:17:31 -05:00
TadahTech
1654850e8c
Final Changes
2016-08-24 22:26:38 -05:00
TadahTech
ba2bee4f25
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:29:01 -05:00
TadahTech
bca19788db
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:28:36 -05:00
cnr
df1fc60d3d
Merge branch 'update/skywars-finalised' into develop
2016-08-24 17:12:58 -05:00
Keir Nellyer
469a72afc0
JavaDocs
2016-08-23 16:40:25 +01:00
TadahTech
c9d14dc522
Update clans to new preferences. Remove debug messages.
2016-08-23 03:12:36 -05:00
TadahTech
bbe44e7d75
Remove debug.
2016-08-23 02:04:07 -05:00
TadahTech
02f703e68e
Remove debug.
2016-08-23 01:57:39 -05:00
TadahTech
3b9d6adfbc
Lobby Update
2016-08-23 01:37:07 -05:00
Sam
2c37d17db3
Slight code change
2016-08-22 19:42:30 +01:00
Keir Nellyer
dcfeaab5e1
Show invalid usage with alias used
2016-08-22 16:48:59 +01:00
Keir Nellyer
fb369d3df9
Add command to unban player from report system
2016-08-22 16:36:42 +01:00
Keir Nellyer
f805ceccdc
Don't include aborted reports in report statistics
2016-08-22 16:07:14 +01:00
xGamingDudex
7fb6ff58d0
Moved gadgets to use a whitelist system instead of blacklist for
...
collisions
2016-08-22 01:00:29 +02:00
xGamingDudex
e64324b36c
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-20 11:40:15 +02:00
Keir Nellyer
bde51e6a54
The server of the handler now handles sending periodic message, instead of it being done through Redis
...
This also fixes server restarts breaking handler messages.
2016-08-19 18:08:36 +01:00
Sam
dc5c2430cd
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-19 17:58:27 +01:00
Keir Nellyer
d05a69ac69
Fix handler message disappearing when changing server
2016-08-19 17:27:05 +01:00
Keir Nellyer
6367321315
Fix weird colouring
2016-08-19 17:26:08 +01:00
Keir Nellyer
eabaa1e68a
Move limit statistic limit to query and sort returned results
2016-08-19 17:01:26 +01:00
Keir Nellyer
834e6b5fdf
Switch to using UtilPlayer.message
2016-08-19 16:48:05 +01:00
Keir Nellyer
26aff936a0
Rename /reportstat command to /reportstats
2016-08-19 16:46:49 +01:00
Keir Nellyer
779efe3f47
Improve display of /reportstat
2016-08-19 16:46:25 +01:00
Keir Nellyer
bbb40a7b6e
A report is considered expired once it's priority is < 1
2016-08-19 16:23:19 +01:00
Keir Nellyer
b6f0e84a02
Fix sql error when attempting to reinsert same report mapping
2016-08-19 16:21:44 +01:00
Keir Nellyer
2a62abfd33
Push chat snapshots at save time instead of handle time
2016-08-19 16:07:06 +01:00
Keir Nellyer
a1a604757b
Remove old todo
2016-08-19 15:48:02 +01:00
Keir Nellyer
5b685a3a86
Fixed query for getting unhandled reports to behave well with abused reports
2016-08-19 15:46:59 +01:00
Keir Nellyer
2211e6c4ef
Fix query for getting reports a user is handling to ignore aborted reports
2016-08-19 15:03:54 +01:00
Keir Nellyer
514757924d
More descriptive message when aborting a report
2016-08-19 14:31:15 +01:00
Keir Nellyer
373c82c11b
Fix query for getting unhandled reports
2016-08-19 14:30:59 +01:00
Keir Nellyer
ee78cf2bb9
Cancel messaging task if handler is no longer present
2016-08-19 14:30:24 +01:00
Keir Nellyer
10a6cbfe3b
Remove handler from report object when aborting a report
2016-08-19 14:29:15 +01:00
Keir Nellyer
24d4da6aa2
Fix query to fetch report not fetching reports with no handler
2016-08-19 14:19:52 +01:00
Keir Nellyer
e6609d59c9
Fix incorrect MySQL operator
2016-08-19 14:01:17 +01:00
Sam
c4cb5d8db4
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-19 12:56:24 +01:00
LCastr0
84c6720d1c
Fix merging errors
2016-08-18 18:30:32 -03:00
LCastr0
f4175ed724
Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D
2016-08-18 18:07:32 -03:00
Keir Nellyer
b4ae149d89
Handlers can now abort a report allowing it to be handled by another
...
member of staff
2016-08-18 14:42:53 +01:00
cnr
a79fa9cd46
Update GWEN preference name to reflect its purpose
2016-08-18 01:59:31 -05:00
cnr
08e1b765f7
Send local Anticheat messages regardless of preference
2016-08-18 01:59:31 -05:00
cnr
78fe41a8af
Update Anticheat ban message and duration
2016-08-18 01:59:30 -05:00
cnr
999237fe69
Accurately report game TPS
2016-08-18 01:59:05 -05:00
cnr
405f67f8b2
Implement/activate Anticheat phase two
...
- Remove anticheat guardians from Arcade
- Uncomment/implement Anticheat phase two actions
- Specifically: immediate ban on Kill Aura type A, VL 200.
- Give moderators less-specific messages, and limit messages by severity
2016-08-17 23:23:20 -04:00
xGamingDudex
69275cb79c
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-17 20:57:18 +02:00
Keir Nellyer
3126d540e7
/reportstat command progress
2016-08-16 21:30:37 +01:00
Sam
0176f31f1e
Complete implementation of kit progression
2016-08-16 18:55:26 +01:00
Keir Nellyer
3760166599
Remove remnants of old user report preference
2016-08-16 14:13:01 +01:00
Sam
29a07c60ab
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-16 11:02:15 +01:00
Sam
6839006bd1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-15 20:25:01 +01:00
cnr
08e65cb17e
Implement MineplexLink spectator check
2016-08-14 17:40:28 -04:00
xGamingDudex
6e32906805
More Gadget Collision patches
2016-08-14 22:50:48 +02:00
xGamingDudex
045445791a
Fixed gadget collision checks
2016-08-14 21:06:28 +02:00
xGamingDudex
e71cec874e
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-14 20:09:01 +02:00
Sam
8f4303cf39
Progress on Upgrade Details
2016-08-13 22:40:33 +01:00
Shaun Bennett
0f4f1a3582
Remove pointless try/catch
2016-08-13 01:39:56 -05:00
Shaun Bennett
c99a23d670
Add region and server to chat payload
2016-08-13 00:57:39 -05:00
Shaun Bennett
a744566cd3
Add AntiSpam front end
2016-08-11 11:34:17 -05:00
Keir Nellyer
a8e891f247
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/report/ReportManager.java
2016-08-11 14:53:57 +01:00
cnr
4562b00dcb
Repurpose MAC reports pref for GWEN reports
2016-08-11 04:01:14 -04:00
cnr
7b1ac5ded2
Merge branch 'update/clans' into develop
2016-08-10 21:27:43 -04:00
samczsun
7de9da3d1c
Complete rework of disguising and antihack hook
...
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.
Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.
Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines
The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
Sam
e05f90372a
Add kit upgrade details
2016-08-10 19:05:40 +01:00
Keir Nellyer
ff7a427787
Handle party chat correctly
2016-08-10 16:57:44 +01:00
Keir Nellyer
cbdce80483
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-08-10 16:01:47 +01:00
xGamingDudex
907ac7473f
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-10 16:52:37 +02:00
Sam
2f3ff052ff
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-08 22:59:55 +01:00
Sam
4c825cf80b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-08 22:48:33 +01:00
cnr
4180f03a52
Use the correct SalesPackageBase for gadgets
2016-08-07 22:40:26 -04:00
AlexTheCoder
95302177f8
Add cooldowns to all gui items tied to giving rewards to prevent some exploitation
2016-08-07 14:47:14 -04:00
AlexTheCoder
4e0971ab0a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-08-05 14:35:57 -04:00
AlexTheCoder
bf7065732b
Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have
2016-08-05 13:34:04 -04:00
Keir Nellyer
1854b71757
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
cnr
0ca4fe2d38
Disable MAC kick for suspicious movement
2016-08-04 12:41:59 -04:00
cnr
3610f78b37
Merge branch 'feature/thanks' into develop
2016-08-03 22:23:46 -04:00
Shaun Bennett
85c4c181ec
Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl
2016-08-03 18:22:36 -05:00
Shaun Bennett
e113bedea5
Fix accidentally refactoring "thanks" in strings
2016-08-03 15:11:31 -05:00
Shaun Bennett
72f078fe54
Fix using wrong name, add missing jooq files
2016-08-03 15:04:06 -05:00
Shaun Bennett
6d93efc1a2
Adjust button text as well
2016-08-03 14:57:30 -05:00
Shaun Bennett
ad6c1dd970
Adjust some text wording
2016-08-03 14:55:33 -05:00
Shaun Bennett
2e80838376
Update ClaimTips lore
2016-08-03 14:25:07 -05:00
Shaun Bennett
1ae7f6cb25
Integrate the new ThankManager into Amplifiers
2016-08-03 14:03:12 -05:00
cnr
3f0938815d
Merge branch 'update/clans' into develop
2016-08-03 12:39:52 -04:00
Sam
2b8754aa32
Metal Kit bug fixes
2016-08-02 23:34:12 +01:00
Keir Nellyer
c327309a65
Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future
2016-08-02 16:46:14 +01:00
Shaun Bennett
f41cd8c104
Add /thank command. Update jooq files
2016-08-02 00:10:46 -05:00
