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
cnr
5365f1269f
Delay Anticheat enable in Clans
...
This ensure the anticheat has registered GameStartEvent before we fire
it
2016-08-18 20:46:24 -05:00
cnr
72ddfd5d85
Disable server spawn radius in Clans
...
Defer to the spawn claim area, instead
2016-08-18 20:44:01 -05: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
Sam
3b11a2e985
Killstreaks
2016-08-18 22:02:33 +01:00
LCastr0
f58266f276
Merge pull request #181 from Mineplex-LLC/develop
...
Merges from develop
2016-08-18 18:02:28 -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
AlexTheCoder
c66e485c9e
Fix arrow knockback
2016-08-17 23:22:30 -04:00
Sam
6c1bd88631
Increase passive knockback
2016-08-17 23:33:31 +01:00
Sam
1565b66395
Ore level changes
2016-08-17 23:33:17 +01:00
Sam
8d6e4a5fd3
Remove some unused code and cleanup
2016-08-17 22:28:22 +01: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
604f5bc2cc
Update to work with new scoreboard system
2016-08-16 11:03:12 +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
84e5b38380
Testing session feedback
2016-08-16 10:53:37 +01:00
Sam
dac4d9595c
Change scoreboard to use new system
2016-08-15 20:28:12 +01:00
Sam
6839006bd1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-15 20:25:01 +01:00
Sam
d5d8f07085
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple
2016-08-15 19:21:56 +01:00
Sam
df606d5e07
Changed game logic to try out multiple round concept
2016-08-15 19:19:20 +01:00
Sam
09741d4d2a
Added VersionModule (The new way to check client versions for games)
2016-08-15 19:18:51 +01:00
Sam
ea7d877d36
Some attempt at per player kits
2016-08-15 17:45:24 +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
Shaun Bennett
39b1e790cb
Merge pull request #178 from Mineplex-LLC/feature/antispam
...
AntiSpam Step 1
2016-08-14 02:55:53 -05: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
Sam
33cb4db338
Minestrike - Stop vanished players being assigned teams on join
2016-08-12 19:52:23 +01:00
Sam
2915a5e3b9
Add mid-game kit changing NPCs
2016-08-11 21:16:49 +01:00
Sam
69fd78bbf2
Remove Shurikens
2016-08-11 19:05:13 +01: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
