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
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11:00
e91d76960c
Add a toggleable friends GUI - Chat to Inventory and back
2015-02-03 22:03:07 +13:00
ea24bc1d87
Prevent treasure chests being opened from interfering with portals, ladders, etc.
2015-02-01 12:19:33 +13:00
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
ff56578d15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:29:12 -08:00
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
ff73c88182
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 19:28:29 +13:00
a1529e0884
Notify player when no friends found when searching
2015-01-30 19:28:04 +13:00
352a29390b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:19:12 -08:00
ed08e4b112
Changed coloring for server line in friends gui.
2015-01-29 22:18:59 -08:00
96ce95b72e
treasure changes
2015-01-30 00:37:02 -05:00
79a60db15d
More tweaks
2015-01-29 22:41:54 -05:00
1cc0879ce9
treasure stuff
2015-01-29 22:17:46 -05:00
81a52184c9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 17:50:24 -08:00
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
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
50a8fb03a9
Work on treasure............
2015-01-29 18:37:29 -05:00
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
10ab390bd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-26 11:20:12 +11:00
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
58a8a32e93
Added cross-server Announcements and Global messages.
2015-01-24 01:44:22 -08:00
39d1a48bc1
Added cross-server instant punishments.
...
[Punish] Banning doesn't kick.
2015-01-23 23:33:24 -08:00
34cd48cfb6
Fix for duplicate check.
2015-01-23 01:17:27 -08:00
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
b92226a771
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 00:55:36 -08:00
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
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
a1f2a3a2a1
Clan Energy
2015-01-22 20:34:44 -05:00
d90a46252e
Allow commands to pass when muted.
2015-01-19 00:50:05 -08:00
9b4f1a491e
Add new method to Hologram - Remove hologram on entity death
2015-01-18 21:23:47 +13:00
c83643564b
Fixed scoreboards reading from file.
...
Fixed scoreboard server name length
Changed how we pull server group on startup.
2015-01-13 12:22:47 -08:00
d9360f2599
Ok testing fail. Reverted ServerConfiguration change.
2015-01-12 12:48:57 -08:00
cd5574ab43
Changed ServerConfiguration to only pull its groupName specifically.
...
Changed StatsManager to only run once every second and to upload all stats.
2015-01-12 12:19:13 -08:00
e14dfcf313
Fixed Lobby sending with Portal.
2015-01-12 09:55:32 -08:00
ac709d09ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-11 00:42:55 -08:00
8e04a2a5f2
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
...
Refactored portal method names.
2015-01-11 00:42:31 -08:00
47fc6e3b94
Revert "Added pool based repository and converted everything but account and donation repositories to it."
...
This reverts commit 8de8d31eec
2015-01-11 00:41:40 -08:00
8de8d31eec
Added pool based repository and converted everything but account and donation repositories to it.
2015-01-10 11:53:25 -08:00
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
86993ddd55
Fixes again for number player names.
2015-01-03 04:27:28 -06:00
cc06b0ad33
Refactored statmanager to only upload stats on disconnect and only one player per tick.
...
Fixed derp json crap with redis treating a name with only numbers as a number and adding .0 on it.
2015-01-03 01:58:04 -06:00
aca7fd6849
Removed all create calls
2014-12-31 09:38:41 -05:00
4b937dfade
Refactored inventory repository to use 1 second queue
...
Added 15 second timeout for server connection if db freezes.
2014-12-31 09:38:28 -05:00
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
f0e3520343
Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin
2014-12-29 08:02:14 -05:00
01bc2ed2ba
Uno mas warning cleanup.
2014-12-29 07:11:21 -05:00
Chiss
libraryaddict
Jonathan Williams
Shaun Bennett