Commit Graph

2555 Commits

Author SHA1 Message Date
Jonathan Williams 594f0c6045 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 17:15:06 -08:00
Shaun Bennett e21e27f07f Merge remote-tracking branch 'origin/master' 2015-02-10 13:33:59 -05:00
Shaun Bennett 6b3f2114f2 Holy debug code! 2015-02-10 13:27:29 -05:00
Jonathan Williams 80a5acd9f2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 04:18:05 -08:00
libraryaddict 5a516e4c78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-11 00:59:45 +13:00
libraryaddict 77350e51de Using the wrong servername in PlayerTracker 2015-02-11 00:58:21 +13:00
Jonathan Williams 258c1ca7fc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:27:05 -08:00
Mini-Chiss d9521bd05a lowered gameloot chances 2015-02-10 23:26:37 +13:00
Jonathan Williams ff10d0cb06 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:22:57 -08:00
Jonathan Williams 246acc721a Clans compiles now ;) 2015-02-10 02:22:47 -08:00
Jonathan Williams 4c0e6642f4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:12:23 -08:00
Jonathan Williams 3a912c13ec Add nocheat to MPS 2015-02-10 02:11:27 -08:00
Mini-Chiss 01173a2e13 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 19:12:56 +13:00
Mini-Chiss 884df48695 disguise command (not yet working fully) 2015-02-10 19:08:54 +13:00
Shaun Bennett 336ba50f59 Rename some enum values for treasures, update my packet change 2015-02-09 23:24:43 -05:00
Mini-Chiss cb9246281c TEASURE! +R 2015-02-10 16:49:50 +13:00
Mini-Chiss 37a5024fcd more chest polish 2015-02-10 13:22:42 +13:00
Mini-Chiss 04d0a1cba1 fixed lore 2015-02-10 12:40:51 +13:00
Mini-Chiss edddff503e Treasure ready ;o 2015-02-10 12:38:08 +13:00
Mini-Chiss c1f9f94c2a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 12:23:28 +13:00
Mini-Chiss 6bbf9bd321 Ability to purchase old chests 2015-02-10 12:23:11 +13:00
Mini-Chiss af95d3ba4e Treasure update 2015-02-10 12:09:37 +13:00
libraryaddict c2c63f4fc0 Null check in MessageManager 2015-02-10 04:17:38 +13:00
libraryaddict 29f3241098 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 02:32:13 +13:00
libraryaddict ce7db289a7 Add commands /ignore and /unignore. Fixed mutes not working with private messaging 2015-02-10 02:31:33 +13:00
libraryaddict cf0134a577 Change commandmanager to cancel event if command is registered, despite not having permissions 2015-02-10 02:20:54 +13:00
Jonathan Williams 51e1798d8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-09 00:19:15 -08:00
Jonathan Williams c5b7e97623 Added NoCheatPlus hooks. 2015-02-09 00:18:51 -08:00
Jonathan Williams fb563c9274 Fixed customer support whitelist names. 2015-02-09 00:16:20 -08:00
Jonathan Williams fcba1db291 Fixed server transfer bug. 2015-02-09 00:15:45 -08:00
Jonathan Williams f98d6e0534 Fixed personal servers overriding existing servergroups. 2015-02-09 00:15:18 -08:00
Mini-Chiss 26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Shaun Bennett c285fae035 Merge remote-tracking branch 'origin/master' 2015-02-06 23:40:14 -05:00
Shaun Bennett b85494a037 Show player skins in friend gui 2015-02-06 23:40:06 -05:00
Shaun Bennett ed8638ae9f Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it 2015-02-06 23:39:22 -05:00
libraryaddict 219ac93dc4 Don't allow the server to increment the mapcount information. 2015-02-07 16:06:53 +13:00
libraryaddict c61f97d0eb Why didn't this get included in that previous commit.. 2015-02-07 03:54:19 +13:00
libraryaddict 8851cccff4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-07 03:53:17 +13:00
libraryaddict 68d1ba4507 Add API to create walls of maps to create a giant image. Please use responsibly. 2015-02-07 03:52:19 +13:00
Shaun Bennett de1d2d4688 Just ignore this commit. Nothing fancy here! 2015-02-06 00:42:17 -05:00
Shaun Bennett 36b43af2c2 Fix inconsistency in friends gui 2015-02-06 00:14:46 -05:00
Shaun Bennett 48db23c862 Fix for enderchests closing after being opened, go shaun! 2015-02-06 00:10:17 -05:00
Shaun Bennett 922f2d5ee9 Merge remote-tracking branch 'origin/master' 2015-02-05 23:20:45 -05:00
Shaun Bennett fcb3d20778 Move tablist stuff to portal, show current server on tablist 2015-02-05 23:20:39 -05:00
Shaun Bennett 2f64b5f401 1.8 tablist fix - spigot needs to be updated! 2015-02-05 23:09:20 -05:00
Chiss 417122b7a7 reduced rate that smash crystal spawns 2015-02-06 14:47:34 +11:00
Chiss 09b78fccd7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-06 14:16:26 +11:00
Chiss 14fc6f2145 Chest Update 2015-02-06 14:16:10 +11:00
Shaun Bennett f8885e4c5c Merge remote-tracking branch 'origin/master' 2015-02-05 21:36:19 -05:00
Shaun Bennett d878e3940e War state, handle time better, ability to have a server timezone (see ClanManager) 2015-02-05 21:36:07 -05:00