Commit Graph

1367 Commits

Author SHA1 Message Date
Jonathan Williams 8d9d298f0f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-01 00:04:44 -07:00
Cheese 987bf266ee fixed bug in moo 2015-04-01 18:02:56 +11:00
Cheese da9e7892f0 fixed aprilfools bugs
mamapig debug :(
2015-04-01 18:01:09 +11:00
Jonathan Williams 38798d3baf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-31 23:47:27 -07:00
Jonathan Williams 6037da6e0f Improved fix for coinQueue memory leak. 2015-03-31 23:47:08 -07:00
Jonathan Williams 405d0fec18 Work on FriendRepository, still not enabled yet. 2015-03-31 23:46:43 -07:00
Cheese 31ddeaac50 a little more moo 2015-04-01 17:28:05 +11:00
Jonathan Williams 10c7d06a88 Memory leak fixes for DisguiseManager and DonationManager. 2015-03-31 23:16:15 -07:00
Cheese 59fce1cd88 adding some mmoooo text
changed pig kit for baconbrawl
2015-04-01 17:15:56 +11:00
Cheese ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
Shaun Bennett 50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
libraryaddict b84756ef7a Revert wizard commits 2015-03-27 22:13:50 +13:00
libraryaddict a27e6fba5c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-27 06:00:14 +13:00
Cheese e3eda38c2c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-26 10:10:11 +11:00
Cheese 6ab03e95ec more timings for visman 2015-03-26 10:08:41 +11:00
Jonathan Williams f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams 6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account.
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
Jonathan Williams 589d4b1aae CoreClientManager accessible to public in MiniDbClientPlugin now. 2015-03-25 15:03:08 -07:00
libraryaddict d3e37d4578 CustomExplosion & explosion/Explosion.java: Add option to use falling block explosions on CustomExplosion by option in Explosion to only spawn falling blocks, not remove blocks so that CustomExplosion can handle that 2015-03-25 20:32:03 +13:00
Cheese 80d350ff85 fixed timedata not storing title 2015-03-23 17:22:11 +11:00
Cheese 4bcdb561be one more timing 2015-03-23 16:40:59 +11:00
Cheese 5fded981d9 Timings for Visibility 2015-03-23 16:38:17 +11:00
Jonathan Williams 4b81f6cd8b Fixed Memory leak with lastState in VisibilityData 2015-03-20 09:05:25 -07:00
Cheese f54ed0ece2 visibility fix 2015-03-20 23:20:56 +11:00
libraryaddict 1f0e204eb3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
2015-03-18 00:04:41 +13:00
libraryaddict 52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
libraryaddict ec30269a14 Add new loot classes to manage loot 2015-03-17 18:08:47 +13:00
libraryaddict 921deb5270 Update disguises for 1.8, add sleeping ability to player disguises 2015-03-17 17:48:29 +13:00
libraryaddict 65a9073c69 Add border packet and resource pack status packet. Add ability to listen to incoming packet Use Entity 2015-03-17 17:42:16 +13:00
Cheese 73c66fa93f Merge branch 'SpecRemoveCreative'
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
Cheese 44e887ec61 fixed give command to properly assign item data 2015-03-17 12:06:41 +11:00
Jonathan Williams 2dade32499 Added support for creating Event servers. 2015-03-15 20:50:54 -07:00
Cheese 4581f49948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-16 13:39:54 +11:00
Cheese 420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Jonathan Williams 4b878c5f27 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-15 04:48:01 -07:00
Jonathan Williams fcbac70deb Tweaked DB Pool settings, increased connections to 4.
Disabled Friend and Leaderboard for now.
2015-03-15 04:47:53 -07:00
libraryaddict db7def2980 Add relative teleports to /teleport command 2015-03-15 12:42:29 +13:00
libraryaddict 20a51ee7fc Change Blood to unstackable items 2015-03-15 12:30:42 +13:00
Ty Sayers 7811279b26 Convert friend system over to redis-based PlayerStatus data tracking from old SQL storage. 2015-03-14 17:41:16 -04:00
Jonathan Williams d38a28981b Fixed NPE when type /friend with a space after it. 2015-03-14 06:20:33 -07:00
Jonathan Williams b6a8b4cee3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-13 22:45:48 -07:00
Ty Sayers af898e3306 Convert PlayerStatus trackers, Bungee MOTD, and Bungee Server status' from MySQL storage to redis-based system using DataRepository's.
Re-organize structure of ServerData packaging.
2015-03-14 01:03:22 -04:00
Jonathan Williams a93a14c3c1 Changed DefaultTransactionIsolation so entire tables aren't locked every query.
Decreased DBPool down to 3 connections per server.
2015-03-13 20:16:37 -07:00
Jonathan Williams cb93769e03 Converted Bungee to redis.
Increased DBPool maximum connections to 5.
2015-03-13 17:53:36 -07:00
Jonathan Williams 838df3f57a Added UUID lookup for saveRank call. 2015-03-13 17:52:25 -07:00
Jonathan Williams 28f73704e5 Improved party lookup for server transfers.
Always transfer party if leader transfers servers.
2015-03-13 00:10:29 -07:00
Cheese c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Jonathan Williams b1ffe4d07b Re-enabled target server check. 2015-03-12 15:32:22 -07:00
Ty Sayers f812243185 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-03-12 18:20:08 -04:00
Ty Sayers 33ff7f8e50 Convert leaderboard stat events to insert into the repository using asynchronous task calls. 2015-03-12 18:19:58 -04:00
Jonathan Williams 6394b588ab Re-enabled cross-server functionality.
RedisPartyHandler execution is now run on Bukkit main thread.
2015-03-12 04:10:15 -07:00
Cheese 3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Jonathan Williams 23de2f735d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-11 18:31:29 -07:00
Jonathan Williams bf87cfd0cd Merge remote-tracking branch 'remotes/origin/sql_pooling' 2015-03-11 18:30:52 -07:00
Jonathan Williams 626bfc35fc Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.""
This reverts commit 215ec7b00d.

Enabled multi-queries on db pool.
Cleaned up some code using new pooling getConnection inappropriately
2015-03-11 18:05:13 -07:00
libraryaddict 9cf0e4d1e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-11 13:17:16 +13:00
libraryaddict f47447134e Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands 2015-03-11 13:16:00 +13:00
Cheese 16a8fbe088 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 22:15:38 +11:00
Cheese 3a0e597276 more event server stuff 2015-03-09 22:15:24 +11:00
Jonathan Williams 27c17eccfb Disabled redis pub commands.
Added getServerStatusesByPrefix to redis.
Increased timeout for servers.

Turned on DoubleGemWeekend
2015-03-08 13:47:49 -07:00
Jonathan Williams 8cc60e1b65 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 21:49:37 -08:00
Jonathan Williams 14da350b16 Removed unnecessary Windows DB call for Pet Factory. 2015-03-07 21:47:48 -08:00
Ty Sayers 4237cd082c Add support for master-slave replication in redis to balance load of read and writes. Redis based repositories now read/write to specified connection pools (master or slave). 2015-03-07 23:19:35 -05:00
Ty Sayers 215ec7b00d Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."
This reverts commit adfe5fb74e.
2015-03-07 19:38:06 -05:00
Ty Sayers adfe5fb74e Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections. 2015-03-07 19:36:54 -05:00
Cheese e0ba667613 old chests drop a little more frequently 2015-03-07 11:53:18 +11:00
Cheese 480a5225f3 increased coin loot from rare chest drops 2015-03-07 11:49:01 +11:00
Jonathan Williams 90dbd64b17 Added closes to connections in RepositoryBase that use DataSource. 2015-03-06 04:12:46 -08:00
Jonathan Williams c15c6e2dd8 Removed threading for ServerCommandManager
Removed target server check (some commands are broadcasted)

Disabled Message/Party crossserver listeners.
2015-03-06 04:12:11 -08:00
Jonathan Williams 2d7f65588c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-06 01:36:38 -08:00
Jonathan Williams 09ecb994f6 Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
Removed ArcadeRepository as its unused.

Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
Cheese e62d9774a9 Initial Event Game push 2015-03-06 19:11:26 +11:00
Jonathan Williams 5c738a2e3c Added two-strike system to NCP hooks. 2015-03-05 16:46:50 -08:00
Jonathan Williams 3e27675d96 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-02 12:50:28 -08:00
Jonathan Williams 5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
libraryaddict d6c3b330b5 Fix redis working on the same thread 2015-03-02 03:44:38 +13:00
Jonathan Williams 789e750cbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-01 01:09:28 -08:00
libraryaddict 3f7eceb907 Disable redis being sent for player messaging and parties. 2015-03-01 17:40:52 +13:00
libraryaddict 3b4075392a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-01 15:16:15 +13:00
Jonathan Williams e5189bea40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-28 10:26:25 -08:00
Shaun Bennett 81a7e1f1f2 Better hover effect for treasure chests - also fixes hover only showing for old chests 2015-02-28 00:37:22 -05:00
Shaun Bennett 42600a0c70 Call direct methods in friends gui instead of running commands (prevents getting command spam errors when trying to mass add/delete friends) 2015-02-27 23:36:36 -05:00
Shaun Bennett c916957a07 Fix block morph with treasure chests 2015-02-27 23:22:45 -05:00
Shaun Bennett 90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
libraryaddict d23d146f35 Fix up admin message typos 2015-02-27 21:12:31 +13:00
Shaun Bennett efce714375 DEVP-66 Refactor commonly used classes to Java conventions
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
libraryaddict d9184ad423 Disable /a for muted players 2015-02-25 23:20:40 +13:00
Shaun Bennett cf7e2eed69 Merge with MPS Update 2015-02-24 21:11:16 -05:00
Shaun Bennett 45fd3cc537 Revert "Update JOOQ files, update IntelliJ config file for JIRA"
This reverts commit db3f2989c0.
2015-02-24 21:03:59 -05:00
libraryaddict bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
Shaun Bennett cea172a713 Give more cpu to SnrMod+/Youtube private servers 2015-02-24 17:39:02 -05:00
Shaun Bennett 47ef3617f4 Give SnrMod+/Youtube servers 2GB of ram instead of 1GB 2015-02-24 14:43:38 -05:00
Shaun Bennett 48dd5639d2 Kick banned players from games 2015-02-24 14:38:12 -05:00
libraryaddict fc5771b33c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-24 13:04:06 +13:00
libraryaddict 56e03221ad Improve party system 2015-02-24 13:03:51 +13:00
Jonathan Williams e1818a9c32 Fixed stat overrite bug. 2015-02-23 00:45:45 -08:00
Jonathan Williams 87558eb01a Merge pull request #10 in MIN/mineplex from leaderboards_dev to master
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
  Remove old lines of debug code.
  Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-21 01:55:59 -06:00
Ty Sayers e1f7e2dbcc Remove old lines of debug code. 2015-02-19 18:55:21 -05:00
Ty Sayers def101cc8d Add in hooks to update statistical events log for leaderboards.
Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-19 18:53:46 -05:00
libraryaddict 0aee8042b5 Changed /locate to return the located players name, not fed target 2015-02-18 09:27:58 +13:00
libraryaddict d29b43d645 Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages. 2015-02-17 15:17:14 +13:00
libraryaddict 3b0a131ca2 If private messaging is turned off, deny messages, even from friends. 2015-02-15 22:10:15 +13:00
libraryaddict 3ef3689e6d Fixed RedisMessageCallback not being registered 2015-02-15 22:01:10 +13:00
Jonathan Williams fd0547d9d3 Added connection re-establishment to database calls if error occurs. 2015-02-14 22:50:52 -08:00
Jonathan Williams c129deb201 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-14 22:05:24 -08:00
Jonathan Williams 17543910b5 Added Chest packages to support server.
Fixed Punish not loading.
2015-02-14 15:09:42 -08:00
Mini-Chiss e33fd3f249 disallow people from talking about hacks in chat. 2015-02-15 09:01:55 +13:00
libraryaddict 0071d6220d Change locate command to moderators and up 2015-02-14 22:22:15 +13:00
Jonathan Williams 6ff0928fbd Fixed RB with exemption in NCP hooks. 2015-02-14 00:48:07 -08:00
libraryaddict 0cd0c61200 Add /locate|where|find command to find other players in other servers 2015-02-13 20:57:46 +13:00
Shaun Bennett db3f2989c0 Update JOOQ files, update IntelliJ config file for JIRA 2015-02-12 14:17:04 -05:00
libraryaddict 876005b3e3 Fixed sending admin cross-server messages not setting last admin to 2015-02-12 22:27:09 +13:00
libraryaddict 858a6fb674 Fixed FriendsGUI not removing ghost items when redrawing page 2015-02-12 04:08:43 +13:00
libraryaddict 9bdf248643 Add cross-server message and adminmessage commands. Fixed casing on messagecommands package. 2015-02-12 04:08:06 +13:00
libraryaddict 1b11c5dbbf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-12 04:06:19 +13:00
libraryaddict f41473da8f Add message to unignore when no parameters are given 2015-02-11 23:11:21 +13:00
Jonathan Williams 6383cf7ce6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-02-10 18:17:13 -08:00
Shaun Bennett 1b4d1d94e9 Merge remote-tracking branch 'origin/master' 2015-02-10 21:15:53 -05:00
Shaun Bennett 58eaaaa2ee Treasure fixes 2015-02-10 21:15:44 -05:00
Jonathan Williams 86b0a578ba Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 18:13:49 -08:00
Mini-Chiss 264ecfc362 lowered legendary chance on old chest slightly 2015-02-11 15:13:33 +13:00
Jonathan Williams f0d2ff1c9d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 17:44:36 -08:00
Mini-Chiss 500e37a618 fixed ender chest shop item 2015-02-11 14:44:14 +13:00
Mini-Chiss 92d3a7dab8 all chests purchasable by coins 2015-02-11 14:42:41 +13:00
Mini-Chiss cafa59d7e8 adjusted reward rarities 2015-02-11 14:16:08 +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 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
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 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.

REVERT ALL SHAUNS CRAP.
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
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
Chiss 4bfd34034b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-23 22:19:50 +11:00
Chiss 8c2d879036 added ownership of legend particle for legends. 2014-12-23 22:17:39 +11:00
Jonathan Williams d2e078f890 Fixed ranks for MPS 2014-12-23 06:04:42 -05:00
Jonathan Williams fb841c3831 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
2014-12-23 05:57:45 -05:00
Jonathan Williams bb8b1d60f9 30 seconds recharge on ability to host locally. 2014-12-23 05:56:17 -05:00
Shaun Bennett 5f509ca488 Rank fixes, visual fixes, lets hope things work! 2014-12-23 04:55:00 -06:00
Jonathan Williams 7ef2edd498 Removed extra enjin message.
Added retrieval of servergroups to identify if server is a player server or not.
2014-12-23 04:19:24 -05:00
Jonathan Williams 9a767af018 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 03:44:05 -05:00
Jonathan Williams f00854ee4c Removed bad code thats bad from the bad birdy.
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.

Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
Chiss 6b5b072ae8 missing file 2014-12-23 19:36:23 +11:00
Chiss 7496f64d58 benefit 2014-12-23 19:36:10 +11:00
Jonathan Williams 103ff0e6b0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 02:57:24 -05:00
Shaun Bennett 2a585936b7 Maybe I should test before I commit! 2014-12-23 00:37:29 -06:00
Shaun Bennett 2848ec2751 Use the correct data value this time! 2014-12-23 00:33:47 -06:00
Shaun Bennett 48fdfbb8f0 Hub changes for private servers 2014-12-23 00:30:15 -06:00
Jonathan Williams 4cac65a81f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 00:50:20 -05:00
Jonathan Williams 0e85b7e6cc Added HostName to server groups.
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
Chiss 0659f497c0 frost lord update 2014-12-23 15:00:32 +11:00
Chiss 4797b251b1 YAY Champions enable/disable works. 2014-12-23 11:39:03 +11:00
Chiss 825b25e8d1 fixed my bug in miniplugin 2014-12-23 11:29:48 +11:00
Chiss ec9401506c Game servers can now run champions/normal on the fly. 2014-12-23 11:18:48 +11:00
Chiss a197724de8 fixed le bugs. 2014-12-23 10:48:15 +11:00
Chiss 224d1bbf63 blizzard particle redo
hub text
2014-12-23 10:36:48 +11:00
Jonathan Williams b83a81ec7e Fixed little conflict issue. 2014-12-22 09:25:02 -05:00
Jonathan Williams 9b3350c8c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-22 09:22:50 -05:00
Jonathan Williams d920439ec5 Clans update. Laying groundwork for energy 2014-12-22 09:22:10 -05:00
Chiss 4a50e3ae62 Merge branch 'chissbrokethis'
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:57:39 +11:00
Chiss 98b614848d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00