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
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
Chiss
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
Jonathan Williams
44bab01e33
Added NoCheatPlus hook for double jump fly hack prevention.
2015-02-04 21:52:14 -08:00
Chiss
dbd6f449eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2015-02-05 11:37:35 +11:00
Chiss
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11:00
libraryaddict
e91d76960c
Add a toggleable friends GUI - Chat to Inventory and back
2015-02-03 22:03:07 +13:00
libraryaddict
ea24bc1d87
Prevent treasure chests being opened from interfering with portals, ladders, etc.
2015-02-01 12:19:33 +13:00
libraryaddict
eccc2f2fb0
Fixed bug with dropping gadget items interfering with games and being set in the wrong slot with the wrong name
2015-02-01 08:04:19 +13:00
Jonathan Williams
ff56578d15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:29:12 -08:00
Jonathan Williams
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
libraryaddict
ff73c88182
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 19:28:29 +13:00
libraryaddict
a1529e0884
Notify player when no friends found when searching
2015-01-30 19:28:04 +13:00
Jonathan Williams
352a29390b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:19:12 -08:00
Jonathan Williams
ed08e4b112
Changed coloring for server line in friends gui.
2015-01-29 22:18:59 -08:00
Shaun Bennett
96ce95b72e
treasure changes
2015-01-30 00:37:02 -05:00
Shaun Bennett
79a60db15d
More tweaks
2015-01-29 22:41:54 -05:00
Shaun Bennett
1cc0879ce9
treasure stuff
2015-01-29 22:17:46 -05:00
Jonathan Williams
81a52184c9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 17:50:24 -08:00
Jonathan Williams
b14d09ed2c
Reduced connection checking to every 2 minutes.
...
Removed kill script call as it was encountering access errors..
2015-01-29 17:47:59 -08:00
libraryaddict
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
Chiss
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
Chiss
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
Shaun Bennett
50a8fb03a9
Work on treasure............
2015-01-29 18:37:29 -05:00
Chiss
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
Chiss
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
Chiss
10ab390bd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-26 11:20:12 +11:00
Chiss
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
Jonathan Williams
58a8a32e93
Added cross-server Announcements and Global messages.
2015-01-24 01:44:22 -08:00
Jonathan Williams
39d1a48bc1
Added cross-server instant punishments.
...
[Punish] Banning doesn't kick.
2015-01-23 23:33:24 -08:00
Jonathan Williams
34cd48cfb6
Fix for duplicate check.
2015-01-23 01:17:27 -08:00
libraryaddict
92ef0af39d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
Jonathan Williams
b92226a771
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 00:55:36 -08:00
Jonathan Williams
73866669b8
Added RestartCommand and SuicideCommand
...
ServerMonitor will now cleanup bloated Lobbies starting from the highest number lobby.
Fixed issue with new servers getting cleaned up as excess as soon as they started.
2015-01-22 23:19:40 -08:00
Jonathan Williams
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
