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
Sam
7db41a8be5
Reduce Earth kit scaling
2016-08-20 22:45:17 +01:00
Sam
28bbda23f5
Remove debug commands
2016-08-20 22:44:54 +01:00
Sam
e6530a6f44
More tweaks and fixes
2016-08-20 12:14:01 +01: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
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
