Commit Graph

995 Commits

Author SHA1 Message Date
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
Shaun Bennett a1f2a3a2a1 Clan Energy 2015-01-22 20:34:44 -05:00
Jonathan Williams d90a46252e Allow commands to pass when muted. 2015-01-19 00:50:05 -08:00
libraryaddict 9b4f1a491e Add new method to Hologram - Remove hologram on entity death 2015-01-18 21:23:47 +13:00
Jonathan Williams 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
Jonathan Williams d9360f2599 Ok testing fail. Reverted ServerConfiguration change. 2015-01-12 12:48:57 -08:00
Jonathan Williams 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
Jonathan Williams e14dfcf313 Fixed Lobby sending with Portal. 2015-01-12 09:55:32 -08:00
Jonathan Williams ac709d09ce Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-11 00:42:55 -08:00
Jonathan Williams 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
Jonathan Williams 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
Jonathan Williams 8de8d31eec Added pool based repository and converted everything but account and donation repositories to it. 2015-01-10 11:53:25 -08:00
Chiss 8ce097d837 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-04 13:21:35 +11:00
Jonathan Williams 86993ddd55 Fixes again for number player names. 2015-01-03 04:27:28 -06:00
Jonathan Williams 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
Jonathan Williams aca7fd6849 Removed all create calls 2014-12-31 09:38:41 -05:00
Jonathan Williams 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
Chiss 5f36c8e424 minor scoreboard changes
legend loot bonus
2014-12-30 08:50:37 +11:00
Jonathan Williams f0e3520343 Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin 2014-12-29 08:02:14 -05:00
Jonathan Williams 01bc2ed2ba Uno mas warning cleanup. 2014-12-29 07:11:21 -05:00
Jonathan Williams 8b5d6ecb6c Cleanup of warnings. 2014-12-29 07:10:41 -05:00
Jonathan Williams 419f33fcc3 Refactored AntiHack a bit to try and remove CCM 2014-12-29 07:07:05 -05:00
Jonathan Williams 97f57b655b Prevent horses from spawning in Clans
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
Jonathan Williams a7f77c09fe Work towards another memory fix. 2014-12-29 06:42:43 -05:00
Jonathan Williams 5a57c5f372 Added Gold saving/retrieval from mysql.
Converted DonationManager to MiniDbClientPlugin.
Fixed bug in DonationRepository with gold.
2014-12-29 06:42:20 -05:00
Jonathan Williams d83a63ef57 Changed FriendManager to start supporting expiry friend requests. 2014-12-26 07:36:07 -05:00
Jonathan Williams 8702bafbd0 Changed storage to player names instead of Player object for CustomTagFix 2014-12-26 00:29:57 -05:00
Jonathan Williams 81e423fa4f Fixed Server transfer stuff. Portal send works! 2014-12-24 14:35:34 -05:00
Jonathan Williams eb5a7b4276 Added Legend package for support.
Refactored Key/Chest commands and added FrostLord package.

Removed password, added whitelist.
2014-12-24 03:41:17 -05:00
libraryaddict adc5769890 Fix wither not accessible for ranks, fix wither having weird naming in inventories 2014-12-24 04:07:28 +13:00
Jonathan Williams 5dcda626e7 Fixed port stuff for MPS 2014-12-23 08:08:41 -05:00
Jonathan Williams 07cca7a1d4 Fixed NPE in GameHostManager
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00