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
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
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
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
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
Jonathan Williams
9e7629b1fe
Added 43k player chest benefit.
...
Updated MOTD.
2015-10-18 00:21:01 -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
577c67cacd
Merge branch 'Myst_HALLOWEEN'
2015-10-16 14:18:35 +11:00
Mysticate
b15b81a7e2
Spacing
2015-10-15 23:09:23 -04:00
Cheese
6cc33fd6c6
Merge branch 'thanos-bug-fixes'
2015-10-16 12:53:43 +11:00
Mysticate
41511dce7b
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-15 21:19:24 -04:00
Shaun Bennett
0df637b80a
Run punishBot in main server thread
2015-10-13 22:56:14 -04:00
Mysticate
a049d7666f
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-13 22:14:19 -04:00
Cheese
45cd2a38e1
admins can botspam
2015-10-14 11:55:59 +11:00
Cheese
d105ea5d7e
botspam addition
2015-10-13 23:19:48 +11:00
Cheese
f5b80c941c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-13 11:58:27 +11:00
Cheese
e8388437b6
botspam now checks for chat as well
2015-10-13 11:58:14 +11:00
AlexTheCoder
bbb863ba92
- Merge conflict patch
2015-10-12 02:36:10 -04:00
Shaun Bennett
1aecc9505c
Add region to titan, new MOTD
2015-10-12 01:30:31 -04:00
AlexTheCoder
bef942f6da
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-12 00:47:56 -04:00
Mysticate
2abf3edad4
Made items for titanic cosmetics dyes.
2015-10-11 22:29:26 -04:00
Mysticate
b6d573a4d5
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-11 22:25:25 -04:00
Mysticate
7a4ccdf680
Bug fixes
2015-10-11 22:17:34 -04:00
Mysticate
20dd9c683b
Merge remote-tracking branch 'origin/master' into monster-maze
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
2015-10-11 10:52:45 -04:00
Jonathan Williams
e6485a9009
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 23:02:36 -06:00
Jonathan Williams
5866e0cce6
Reducing max connections for the DBPool to 3.
2015-10-10 23:02:08 -06:00
Cheese
f23bf18928
adhering to mysts OCD
2015-10-11 14:50:57 +11:00
Cheese
f3e2f3c145
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-11 14:48:17 +11:00
Cheese
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
Jonathan Williams
998d5f6984
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 21:25:29 -06:00
Jonathan Williams
061a7b7c73
Fixed Pet FK errors.
...
Added SUPPORT to acceptable updateRank command.
2015-10-10 21:24:47 -06:00
Cheese
6860fa608a
titan placeholder perks
...
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Cheese
323842c693
fixed mods staying in flight
2015-10-10 19:36:38 +11:00
