Keir
e8c01a1733
Cleanup imports.
2015-10-29 23:29:38 +00:00
Keir
1857afa826
Log report category to database.
...
Allow report to easily be handled by clicking text to fire the reporthandle command.
2015-10-29 17:51:17 +00:00
Keir
d23230504f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-10-29 12:20:27 +00:00
Aaron Brock
8dd80094b4
Fixed a little boolean derp that stopped people from breaking blocks.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd
2015-10-28 23:26:18 -04:00
Aaron Brock
9df297fc11
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6
2015-10-28 23:25:56 -04:00
Keir
38425f25fe
Add missing child overridden methods for chaining.
2015-10-28 16:03:02 +00:00
Keir
dd321439a6
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-10-27 22:40:23 +00:00
Keir
4ceb8f20aa
Make ReportNotification capable of sending json messages.
2015-10-27 22:26:02 +00:00
Keir
cb1c779f37
Close player report if the reported player leaves the game mid-report.
2015-10-27 22:15:06 +00:00
Keir
d9fb0adabb
Only notify staff if 3 or more players report a player.
2015-10-27 22:14:33 +00:00
Keir
53f2356cba
Handle null report closers.
2015-10-27 22:08:42 +00:00
Keir
bc3a119a22
Store report category and only "merge" reports when the category is the same.
2015-10-27 17:30:47 +00:00
Shaun Bennett
556d5adcd9
Change /global to /globalpacket (fixes conflict with announcement command)
2015-10-24 17:46:25 -04:00
Shaun Bennett
0d56eefd44
Titan/Rewards adjustments
2015-10-24 13:40:17 -04:00
Keir
394e501682
Merge branch 'master' into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-10-24 17:50:26 +01:00
Keir
a9fedecc70
Make the ui more appealing and use existing gui system to handle it.
2015-10-24 17:10:50 +01:00
Keir
29587b93f7
Implement initial report interface.
...
Added getPlugin() method to CommandBase.
Changed mini-plugin name from "ReportPlugin" to "Report" to match the other mini-plugins.
This is very WIP, still a lot to be done.
2015-10-24 03:41:03 +01:00
Shaun Bennett
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
Cheese
af208da953
Merge branch 'alex-testrank'
2015-10-23 18:10:59 +11:00
Cheese
d9d0254e46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-23 17:30:59 +11:00
Shaun Bennett
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
AlexTheCoder
1512d87f9e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-23 00:28:32 -04:00
William Burns
e6bec41ca8
Fix "code too large" error.
2015-10-21 20:29:44 +01:00
Jonathan Williams
c719d693dd
Added delete benefit call for repository.
...
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
2015-10-21 01:15:09 -05:00
Cheese
768ef4eb97
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-21 13:00:16 +11:00
Jonathan Williams
3ef33bd9c5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-19 01:32:23 -05:00
Jonathan Williams
5e307da15a
Fix for inventory failure.
2015-10-19 01:32:12 -05:00
Shaun Bennett
6d7f15cd6d
Fix hub time after light flicker
2015-10-18 18:52:16 -04:00
Cheese
c7a5be9570
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-19 09:03:46 +11:00
Jonathan Williams
9e7629b1fe
Added 43k player chest benefit.
...
Updated MOTD.
2015-10-18 00:21:01 -05:00
Cheese
d901cfa12c
buildies can join full
2015-10-18 10:54:34 +11:00
Cheese
41b6fdc74e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 21:47:35 +11:00
Cheese
32489388c6
removed bug fix that caused SG break
2015-10-16 21:47:22 +11:00
Jonathan Williams
172bd65c57
Monster Maze motd.
2015-10-16 04:22:54 -05:00
Jonathan Williams
62b209fede
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 01:57:30 -05:00
Jonathan Williams
d00fa856f3
Fixed Pets so they work correctly.
...
Also fixed legend benefits.
Fixed chest pet rewards.
2015-10-16 01:57:19 -05:00
Cheese
016cea15f3
Merge branch 'Myst_HALLOWEEN'
2015-10-16 15:01:59 +11:00
Mysticate
b8eb924ffa
Fixed timing out. Yay. I'm done. G'night
2015-10-16 00:00:08 -04:00
Cheese
577c67cacd
Merge branch 'Myst_HALLOWEEN'
2015-10-16 14:18:35 +11:00
Mysticate
b15b81a7e2
Spacing
2015-10-15 23:09:23 -04:00
Mysticate
f0a22d5c36
Fixed hammer throw
2015-10-15 23:02:51 -04:00
Mysticate
f0e0d41c42
Fixed two things.
2015-10-15 22:23:49 -04:00
Cheese
6cc33fd6c6
Merge branch 'thanos-bug-fixes'
2015-10-16 12:53:43 +11:00
Cheese
24089000f0
Merge branch 'monster-maze' of ssh://184.154.0.242:7999/min/Mineplex into monster-maze
2015-10-16 12:51:25 +11:00
Mysticate
41511dce7b
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-15 21:19:24 -04:00
Cheese
1c52bd4f64
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-14 14:34:51 +11:00
Cheese
86bad0be30
mods can check other players skills
2015-10-14 14:34:30 +11:00
Shaun Bennett
0df637b80a
Run punishBot in main server thread
2015-10-13 22:56:14 -04:00
Shaun Bennett
39d88e8060
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/botspam/BotSpamManager.java
2015-10-13 22:26:11 -04:00
Mysticate
a049d7666f
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-13 22:14:19 -04:00
