libraryaddict
519dceb72e
Doublejumping downwards is a no no
2015-10-31 19:02:58 +13:00
Cheese
23be8aa1dd
removed unncessary stuff
...
balanced rewards
2015-10-31 14:33:41 +11:00
Cheese
a92a52f009
Merge branch 'Myst_TRICKORTREAT'
2015-10-31 14:27:06 +11:00
Mysticate
4884032a1a
Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3
2015-10-30 23:24:32 -04:00
Cheese
b9d7c80f80
cow kit
2015-10-31 13:25:57 +11:00
libraryaddict
0dfd5387f3
Update patches
2015-10-30 20:26:13 +13:00
libraryaddict
301b8012ff
Final commit
2015-10-30 19:30:17 +13:00
libraryaddict
ea1e4b79f7
Changes from SnD branch
2015-10-30 19:25:02 +13:00
libraryaddict
ed18588a6a
Fix missing code and stuff
2015-10-30 19:12:04 +13:00
libraryaddict
da0a99d662
Spawn facing fixes
2015-10-30 16:06:47 +13:00
libraryaddict
50edf557ab
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-30 15:57:36 +13:00
libraryaddict
388aa1611c
Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate
2015-10-30 15:44:37 +13:00
Cheese
c4e93180fa
Merge branch 'master' into smash-champs-balance
2015-10-30 13:00:30 +11:00
Cheese
dc535ff861
art
2015-10-30 12:59:58 +11:00
Keir
ec5cbbe684
This method is not required, "Plugin" is protected, not private as I previously assumed.
2015-10-30 01:05:45 +00:00
Keir
e266acaf44
Store report categories with a TINYINT to save space and increase lookup performance.
2015-10-29 23:33:23 +00:00
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
Shaun Bennett
e2947718fe
Remove code that wasnt meant to be commited
2015-10-29 13:10:10 -04: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
libraryaddict
7fca42b0e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
2015-10-29 21:41:59 +13:00
libraryaddict
14df456b3d
Progres
2015-10-29 21:39:38 +13:00
Aaron Brock
acc915c34e
Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch.
2015-10-29 01:12:12 -04: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
libraryaddict
0486404c4b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-10-28 14:38:34 +13:00
libraryaddict
5ec932d1ca
Fixing bugs
2015-10-28 14:36:48 +13: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
AlexTheCoder
57da1d195a
- Resolved randomly using java 8 in this one plugin
2015-10-24 20:50:47 -04:00
AlexTheCoder
08fd1b5790
- Fixed MPS Whitelist for usernames with non-lowercase characters
2015-10-24 20:49:09 -04: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
libraryaddict
e3c824c512
Fix minor skywars error
2015-10-24 13:32:55 +13:00
libraryaddict
4d2b359aad
Fix wolf cub strike
2015-10-24 08:41:10 +13:00
libraryaddict
43cd0f86a9
Fix players unable to break blocks at spawn
2015-10-24 08:40:57 +13:00
libraryaddict
7f025ad029
Fix CustomExplosion
2015-10-24 08:40:43 +13:00
Shaun Bennett
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
libraryaddict
2eb8b3e234
Catch PacketHandler exceptions
2015-10-24 02:17:19 +13:00
libraryaddict
5ec4203fd9
More changes to disguise
2015-10-24 01:36:42 +13:00
libraryaddict
a450b828b7
Fix disguises custom name
2015-10-24 00:48:54 +13:00
libraryaddict
de9678a20f
Modify Craftbukkit
2015-10-23 21:28:01 +13:00
