Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
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
Chiss	1a56f074b3	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-22 10:22:13 +11:00
Chiss	eba54c6b8a	Removed hub snake parkour	2014-12-22 10:21:58 +11:00
Jonathan Williams	52cc0862d7	Memory leak fix for CUSTOM TAG	2014-12-18 18:29:33 -05:00
Shaun Bennett	4c4ba34d39	Merge pull request #5 from feature/chatslow to master * commit '9ef0ea629c57b148d815b93a455f9817ce512960': Added changes from master to Chat Chat Slow Command	2014-12-17 20:08:32 -06:00
Shaun Bennett	9ef0ea629c	Added changes from master to Chat	2014-12-17 20:07:39 -06:00
Shaun Bennett	899add5fcd	Merging changes from master Conflicts: Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java	2014-12-17 20:07:11 -06:00
Chiss	60f567a3fb	fixed some errors ;o	2014-12-18 12:47:00 +11:00
Chiss	679f7909b0	Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers	2014-12-18 12:45:56 +11:00
Chiss	56d14b7bc0	Particle stuff	2014-12-18 12:45:45 +11:00
Shaun Bennett	2677d2e557	Fancy icons for 1.8!	2014-12-17 19:15:31 -06:00
Shaun Bennett	d19431a47f	Rename Clicked to onClick	2014-12-17 18:40:44 -06:00
Shaun Bennett	6e42894d5c	Refactor button again	2014-12-17 18:33:24 -06:00
Chiss	12973aba7d	Merge branch 'master' into feature/private-servers	2014-12-17 16:47:19 +11:00
libraryaddict	e1db8d6a5d	Why was I missing a entitytype import..	2014-12-17 18:37:58 +13:00
libraryaddict	26d92f0381	Add missing class	2014-12-17 18:33:43 +13:00
libraryaddict	0e7adab3eb	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-17 18:32:50 +13:00
libraryaddict	17ac36d9ae	Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub	2014-12-17 18:31:51 +13:00
Shaun Bennett	83218c9a73	Pushing unfinished code for laptop	2014-12-16 11:42:06 -06:00
Chiss	a433ad764d	Wither Morph Legend Particle	2014-12-16 16:18:09 +11:00
Jonathan Williams	c43ee95c55	Added 1.8 hooks for disguise setName and getName Refactored method names in some disguise classes.	2014-12-15 21:46:14 -05:00
Chiss	1907014db4	disguise wither update	2014-12-16 13:28:59 +11:00
Chiss	2e7d101850	added material/data for gametypes	2014-12-16 12:26:37 +11:00
libraryaddict	75cf80652c	Remove customnametrue from horse mount	2014-12-16 01:36:42 +13:00
Chiss	d7eb01e8f0	fixed CC Bug :D	2014-12-15 15:49:52 +11:00
Jonathan Williams	e02bcd8b84	Revert the revert of the revert.	2014-12-14 22:58:49 -05:00
Chiss	d1be64d7e7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java	2014-12-15 14:56:09 +11:00
Chiss	95081a8ab7	Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)	2014-12-15 14:33:38 +11:00
Jonathan Williams	4482e46250	Changed int to atomic for concurrency	2014-12-14 21:53:55 -05:00
Jonathan Williams	eefa4de838	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-14 20:50:35 -05:00
Jonathan Williams	2a58b822a0	Safeguard on connecting vlaues.	2014-12-14 20:50:19 -05:00
Chiss	d0f8a6a063	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-15 12:26:25 +11:00
Chiss	9136165d4f	fixed christmas elf name pet names now have limited range	2014-12-15 12:24:40 +11:00
Jonathan Williams	9fb2231d76	Added connecting clients as a factor for status snapshot. Added online check for DonationManager rewarding local info.	2014-12-14 02:32:52 -05:00
Jonathan Williams	5b67e2182a	Added disguise to Pet Manager for eventual wither disguised pet.	2014-12-14 02:30:39 -05:00
Chiss	78a34b1517	hopefully fixed a bug where pumpking king despawned. removed 11 disc from loot	2014-12-13 11:55:12 +11:00
libraryaddict	9a16616e6c	Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas	2014-12-12 12:40:23 +13:00
Chiss	6b1fa91565	Xmas Updates	2014-12-11 12:42:06 +11:00
Chiss	86b9d8342f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java	2014-12-11 11:27:47 +11:00
Chiss	358d5fde44	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-10 22:38:19 +11:00
Chiss	450d3eb923	merge	2014-12-10 22:38:08 +11:00
Jonathan Williams	c4fee8e681	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Hub/.classpath	2014-12-10 03:34:53 -08:00
Jonathan Williams	ea034812b9	Fixed path finder crap in UtilEnt Cleaned up unused code in OutfitRaveSuit Fixed eclipse bug for NotificationManager Removed christmas/Sleigh columns.	2014-12-10 03:32:35 -08:00
Chiss	db8e0484ab	missing files + new pet	2014-12-10 18:23:22 +11:00
Chiss	0aba82eee6	fixed some eclipse java6 stuff with mail Christmas game update	2014-12-10 15:38:57 +11:00
Chiss	bee81ff455	lowered coin rewards	2014-12-09 20:23:56 +11:00
Chiss	828fabb80a	Initial Christmas Chaos update	2014-12-09 20:04:59 +11:00
Chiss	ef8e5104f1	SnD Kits minor bug fixes	2014-12-08 17:28:18 +11:00
Chiss	64c8edc292	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-08 17:25:03 +11:00
Shaun Bennett	0759a373da	Fix treasure chest hologram	2014-12-07 01:25:36 -06:00
Shaun Bennett	7402eb2f91	Merge remote-tracking branch 'origin/master'	2014-12-06 01:00:40 -06:00
Shaun Bennett	1276e0c0d5	Chat Slow Command	2014-12-05 21:33:31 -06:00
Jonathan Williams	21e80af6cb	Fixed Cosmetic menu buttons Removed map in wrong location Removed message for removing armor.	2014-12-05 01:15:25 -08:00
Jonathan Williams	828e8d4115	Fixed bug with ok buttons still active after clicking ok in confirmation page.	2014-12-04 23:48:22 -08:00
Jonathan Williams	3d3f9012ff	Added some base Clans shops. Added support for Gold Refactored failed db call code a bit.	2014-12-04 23:41:49 -08:00
Chiss	80971c2fe7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-05 16:27:30 +11:00
Chiss	4430efd7be	minor updates	2014-12-05 16:25:34 +11:00
Shaun Bennett	f48085d5ca	Merge remote-tracking branch 'origin/master'	2014-12-04 17:41:40 -06:00
Shaun Bennett	0bb2d1db5b	Some changes _	2014-12-04 17:29:47 -06:00
Jonathan Williams	59f93d46ec	Refactored IButton Added ComplexButton Added Clans farming. Added Clans Recipes. Added Clans gameplay. Added shop files structure.	2014-12-04 05:05:27 -08:00
Jonathan Williams	1fd1e5cc34	Removed unused gem booster code.	2014-12-02 12:50:53 -08:00
Jonathan Williams	384f296d60	checkPlayerName returns actual name (casing correct) Refactored chests/keys in support server. Fixed bug with enjin chest/key giver.	2014-12-01 16:14:02 -08:00
Jonathan Williams	0540168af7	Fixed CCM in AntiHack	2014-12-01 03:01:26 -08:00
Jonathan Williams	e7cf4eb51d	Removed use of Gem Boosters Cleaned up some unused imports.	2014-12-01 02:27:39 -08:00
Jonathan Williams	172f4d20b7	Removed gem transaction logging.	2014-12-01 02:22:51 -08:00
Jonathan Williams	5038edc46b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-01 00:07:33 -08:00
Jonathan Williams	171eec5a37	Removed reward logging.	2014-12-01 00:05:57 -08:00
libraryaddict	89892097d0	No one cares about ComplexItemLayout	2014-11-30 16:48:57 +13:00
Jonathan Williams	9d32048b9e	Fixed merge conflict problem. Added spawn repository.	2014-11-29 03:17:33 -08:00
Jonathan Williams	f507db7664	Reworked spawn to save to database. Work on Clans: Fixed clan loading/updating/adding. Refactored some code for Clans.	2014-11-29 03:16:37 -08:00
Jonathan Williams	4b2998793c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-28 14:16:07 -08:00
Chiss	b3beadf8b5	made recharge look nicer for 1.7 added missing files	2014-11-29 09:14:33 +11:00
Jonathan Williams	54aefbf40d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-28 14:10:28 -08:00
Chiss	ca34ac4e02	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-29 09:09:23 +11:00
Jonathan Williams	92ea94c3be	Fixed creating clan delay in clans/ClientClan.java Added logging for Mineplexer startup. Fixed return generated keys in RepoBase	2014-11-28 14:06:41 -08:00
libraryaddict	e56970a212	Let ShopItem no longer extend CraftItemStack and instead extend ItemStack to remain useful to other plugins and use ItemMeta	2014-11-29 07:21:37 +13:00
Jonathan Williams	62a172e01b	Removed all the UUIDFetcher calls.	2014-11-27 22:34:05 -08:00
Chiss	8f9f88987b	mods can no longer use /tp Here only disqualifies on tp in live games.	2014-11-28 10:09:18 +11:00
Chiss	fdc67e021c	Staff using /tp commands will take them out of the game (Mod to Admin only) Changed spec /tp command to /spec	2014-11-28 10:00:31 +11:00
libraryaddict	d5d9e2eb14	Don't bother with these checks in ItemLayout	2014-11-28 09:30:57 +13:00
libraryaddict	8d12b8e565	Check item has Lore before trying to use it	2014-11-28 09:30:27 +13:00
libraryaddict	d1b6aee802	Change ItemLayout to allow repeats of item arrays	2014-11-27 14:34:34 +13:00
libraryaddict	bd8ca593e8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy	2014-11-27 08:06:13 +13:00
libraryaddict	ac0c024b1b	Use nmsPlayer.m() instead. This sets both the container to default and tells the open inventory to close. Which fixes any normal blocks like DoubleChest from remaining visually open to others.	2014-11-27 07:16:59 +13:00
libraryaddict	86fe7344c7	When another inventory is opened with a previous inventory already open, this fixes the cursor position from being reset to the center of the screen. For those interested. Its basically denying the inventory close packet from being sent.	2014-11-27 06:56:19 +13:00
libraryaddict	34e320dfee	Create untested ItemLayouts for your customized layouts of your items. If you look to your right (ComplexItemLayout) you can define layouts such as "XX(de)XX(fg)XX" then call to replace all occurances of the letter d with this item. The (de) will then be set to that item.	2014-11-27 06:03:28 +13:00
libraryaddict	b160822260	Add follow entity to holograms	2014-11-27 03:17:59 +13:00
libraryaddict	f5533dbce2	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy	2014-11-27 01:13:14 +13:00
libraryaddict	c76ad50136	Allow removal of packet handler	2014-11-27 01:08:42 +13:00
libraryaddict	84b56708f9	Added new class ItemBuilder for chain building ItemStacks	2014-11-27 01:08:38 +13:00
libraryaddict	9928811a71	Merge pull request #2 from Better-Holograms to master * commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89': Remove the 'Made by Shaun' Fix up mistakes in the previous modifications You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly Ignore wither skulls for CustomTagFix Remove old holograms and add new holograms	2014-11-26 06:07:57 -06:00
libraryaddict	ef59cb7a9d	Merging changes from master to Better-Holograms * master: Antistack replacement Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2014-11-27 01:01:19 +13:00
libraryaddict	30e2de6f22	Remove the 'Made by Shaun'	2014-11-27 00:50:02 +13:00
Jonathan Williams	00e372820b	Fixed UI update when purchasing items.	2014-11-26 02:13:19 -08:00
Jonathan Williams	2afe84d7c7	Fixed stupid query thing....defek7. Removed extra logging.	2014-11-26 00:59:10 -08:00
libraryaddict	3ad3fb21ff	Fix up mistakes in the previous modifications	2014-11-26 21:35:45 +13:00
Jonathan Williams	f39e3dcec7	Fixed traversing resultSets.	2014-11-26 00:08:51 -08:00
Jonathan Williams	06526d1e96	Fixed sql bug in FriendRepository move/cleanup in RepoBase	2014-11-25 21:45:34 -08:00
Jonathan Williams	15d129d184	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java	2014-11-25 21:18:12 -08:00
Jonathan Williams	909877c869	Wiggle left, wiggle right, hope this works.	2014-11-25 21:17:30 -08:00
Chiss	4ccb242066	i added a space!	2014-11-26 16:02:11 +11:00
libraryaddict	03075fecae	You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly	2014-11-26 10:28:37 +13:00
Jonathan Williams	484dfaaea9	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-25 13:25:41 -08:00
Jonathan Williams	3b54789767	Optimized logins dealing with mysql with multiqueries. Added lazy loading of Pool data and Loaded check before performing anything. Refactored MiniClientPlugin and created MiniDbClientPlugin Renamed RankBenefitManager9000 to BenefitManager Removed /send ability for now.	2014-11-25 13:25:13 -08:00
libraryaddict	3c76fde190	Ignore wither skulls for CustomTagFix	2014-11-26 09:51:08 +13:00
libraryaddict	141c08ceb8	Remove old holograms and add new holograms	2014-11-26 09:18:36 +13:00
Shaun Bennett	f1fbc21570	Merge remote-tracking branch 'origin/master' Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2014-11-23 20:02:09 -06:00
Shaun Bennett	c7f2a8072e	Antistack replacement	2014-11-23 19:51:23 -06:00
Chiss	2871446f74	reduced max amount of blocks from explosions	2014-11-23 15:01:04 +11:00
Jonathan Williams	37b5e495b8	Update local cache of inventory and if fail, revert change. Removed full lock on login. Removed Thanskgiving benefit.	2014-11-22 17:52:22 -08:00
Jonathan Williams	d1578b12d4	Removed extra console logging.	2014-11-21 14:45:55 -08:00
Jonathan Williams	7bd12ab850	Re-did benefits and inventory to only update locally if db succeeeds......DOH	2014-11-21 14:41:25 -08:00
Jonathan Williams	29204de987	Removed old benefits. Added youtube rank application from Owner Fixed Dom bug : https://trello.com/c/OtwrpFXg/90-champions-24-skill-tokens-2-item-tokens-in-champions-so-broken	2014-11-20 21:58:39 -08:00
Jonathan Williams	2446e6d64d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-20 21:42:40 -08:00
Jonathan Williams	1f5be77880	Fixed text in Dom shop. Cleaned up some code in benefit stuff.	2014-11-20 21:42:33 -08:00
Chiss	f1ba5947a4	Some more wither updates	2014-11-21 16:32:12 +11:00
Jonathan Williams	6c63552480	Refactored RankBenefitsGiver9000 Added Thanksgiving benefits (1 treasure key). ServerMonitor now ignores Testing group.	2014-11-20 21:24:23 -08:00
Chiss	7a8759dfba	updated disguisemanager so it uses player arg fixed invisibility bug on disguises for specific players updated champs skills made some hard achievements a bit easier	2014-11-21 09:42:05 +11:00
Jonathan Williams	ab78b4b89d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-19 22:25:17 -08:00
Jonathan Williams	828b866fc1	Added functionality to RepositoryBase to return generated keys. Prevent invalid UUID from jacking up web call in Enjin listener.	2014-11-19 22:23:42 -08:00
Chiss	450cc9ada2	Champions achievement update Wither update	2014-11-20 17:21:22 +11:00
Shaun Bennett	e99a3f6544	Merge remote-tracking branch 'origin/master'	2014-11-17 18:19:06 -06:00
Shaun Bennett	f071d2e727	Fix for TNT explosion in Bridges	2014-11-17 18:09:58 -06:00
Jonathan Williams	13ba32f2f4	Added command queueing for failed commands in EnjinTranslator. Added verification of coin/gem application in Web api. Added code to support polling last 100 purchases with EnjinTranslator Added UUId lookup to CoreClientManager and fixed Async to Async calls with DatabaseRunnable.	2014-11-17 14:06:38 -08:00
Jonathan Williams	857ff29461	Removed buggy player disguises. Removed datavalues from wither disguise.	2014-11-15 03:21:48 -08:00
Jonathan Williams	48c522a86b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 03:03:52 -08:00
Chiss	8d6793060c	made early levels a little easier to progress through	2014-11-15 21:33:28 +11:00
Jonathan Williams	2af66c99e7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 01:17:21 -08:00
Jonathan Williams	df76f6be10	More work on Clans.	2014-11-15 01:13:14 -08:00
Jonathan Williams	685a2899ca	Added custom name to wither disguise.	2014-11-15 01:12:58 -08:00
Chiss	51bc53262d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-15 19:32:08 +11:00
Chiss	ca4eec20ed	Wither Assault update	2014-11-15 19:31:56 +11:00
Shaun Bennett	521b1e5f3b	Merge remote-tracking branch 'origin/master'	2014-11-13 21:54:15 -06:00
Jonathan Williams	2cf76ae5b4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-13 19:15:05 -08:00
Jonathan Williams	4812da2cd9	More work on Clans - Clan repository.	2014-11-13 19:14:56 -08:00
Jonathan Williams	62fbeeda20	Added Wither disguise.	2014-11-13 19:14:14 -08:00
Shaun Bennett	af31f4cd42	Add Tab handling for MultiCommandBase and "game set" command	2014-11-13 18:22:00 -06:00
Shaun Bennett	48c09aa311	Making spectator gui look better	2014-11-13 18:05:28 -06:00
Shaun Bennett	eb4b451e12	Fixing some spectator gui bugs	2014-11-13 16:41:42 -06:00
Chiss	9eaacd20ab	fixed slime healing fixed sheep quest brute not dropping sheep updated punish page	2014-11-13 18:09:54 +11:00
Chiss	c5a873ffab	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-13 14:40:26 +11:00
Chiss	f9f7a834c2	geno morf	2014-11-13 14:38:33 +11:00
Jonathan Williams	7cad40044a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java	2014-11-12 19:36:00 -08:00
Jonathan Williams	1372f74921	Refactored some names in MiniPlugin Work on clans.	2014-11-12 19:21:12 -08:00
Jonathan Williams	0193c397fb	Added Kit unlocks to staff server Added password persistence in db.	2014-11-12 19:20:41 -08:00
Jonathan Williams	2e848c2ac2	Fixed some of twiggy conflicts.	2014-11-12 05:13:58 -08:00
Jonathan Williams	8d62966abc	Created Clans project. Converted Fields code complete (not tested).	2014-11-12 05:13:16 -08:00
Chiss	71a93bead5	Updated punish to be even less confuse.	2014-11-12 09:49:03 +11:00
Chiss	d7141e4943	Added warning note to punish	2014-11-11 20:02:35 +11:00
Chiss	f7ad986503	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-11 19:05:58 +11:00
Shaun Bennett	c0f2f8a88c	Remove useless comment/import	2014-11-11 01:47:03 -06:00
Shaun Bennett	23ab9756dc	Merge remote-tracking branch 'origin/master'	2014-11-11 01:32:55 -06:00
Jonathan Williams	b08cd54666	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-10 23:31:38 -08:00
Jonathan Williams	827fef535f	Some commented out testing code in DisguiseManager	2014-11-10 23:30:41 -08:00
Jonathan Williams	108421164c	Added support for stats with spaces in them for GiveStat.	2014-11-10 23:30:16 -08:00
Shaun Bennett	5b9b7347c6	Add tab complete processing for commands	2014-11-10 23:49:35 -06:00
Chiss	6c6c51e950	fixed compilation problems	2014-11-11 14:28:35 +11:00
MrTwiggy	e3c50bfb39	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java	2014-11-10 18:55:57 -05:00
MrTwiggy	920bdad64c	Player report system commit, including functionality for long-form MySQL storage of report logs as well as real-time redis based report sessions.	2014-11-10 18:44:46 -05:00
Chiss	d362fb3b1c	fixed punish error	2014-11-10 19:15:56 +11:00
Chiss	0252db5a05	Punish simplification update	2014-11-10 18:40:39 +11:00
Chiss	d5515d11b2	fixed kick reason for bans	2014-11-09 14:27:01 +11:00
Chiss	6405253b1c	added word wrap on punish text in GUI only staff+punishee will now see punishments	2014-11-09 14:09:30 +11:00
Chiss	3c39e3d93a	changed sev2/3 hack punishements updated ban kick/login messages	2014-11-09 13:47:25 +11:00
Chiss	a1f7fc5187	warnings are now friendly :) reach hack detection base	2014-11-09 12:22:55 +11:00
Jonathan Williams	2781bb3000	Removed stacking buffers.	2014-11-08 14:32:37 -08:00
Jonathan Williams	f03fe663f6	Simplified Lobby balancer code to randomize server selection on best 10 servers. Increased rate at which bungee retrieves server information. Increased rate at with servers sends server information.	2014-11-07 22:04:51 -08:00
CoderTim	4c98d833e0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 18:33:46 -05:00
CoderTim	96f54c2949	Made DBPool class uninstantiatable	2014-11-07 18:27:20 -05:00
Chiss	24725eb22e	play a sound when you get punished	2014-11-08 10:15:46 +11:00
Chiss	44fbd9fdd2	updated punishment output. punishee is now informed of the reason in chat.	2014-11-08 10:11:12 +11:00
Chiss	3a3c2002f5	fixed level exp requirements	2014-11-08 09:17:59 +11:00
Chiss	c61ad8907a	set minimum MP level for staff	2014-11-08 09:15:27 +11:00
Jonathan Williams	3309c0406b	Added ∞ for admin/owners as player level. Fixed customer support issue where it wasn't totaling coins correctly. Fixed Recharge memory leak.	2014-11-07 13:54:11 -08:00
Chiss	c93862f299	updated player level added /givestat command for owners (must use full string; Global.ExpEarned)	2014-11-07 22:10:41 +11:00
Jonathan Williams	f0099368d0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 01:27:16 -08:00
Jonathan Williams	264df5af79	Fixed load time issue with ServerConfiguration.	2014-11-07 01:27:07 -08:00
Chiss	c245f84593	increased exp per level in mineplex level achievemnet	2014-11-07 20:10:15 +11:00
Chiss	fadaa59526	added mineplex level removed ability to go into negative gems as villager morph	2014-11-07 19:20:15 +11:00
Chiss	6ded835ba4	MAC will no longer false positive on people standing blocks from block morph.	2014-11-07 14:14:43 +11:00
Chiss	4c675cca9c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2014-11-07 11:54:14 +11:00
Chiss	91e0b42de8	Added start of MPS stuff Some new gadgets	2014-11-07 11:52:58 +11:00
Jonathan Williams	f931bd26e6	Updated ServerConfiguration to support resourcepack and Arcade settings.	2014-11-06 00:25:49 -08:00
Jonathan Williams	6f2a6a6ebd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-05 14:45:54 -08:00
Jonathan Williams	44ccd452a3	Added ServerConfiguration. Added support to enable whitelist, alter max players and pvp value.	2014-11-05 14:44:56 -08:00
Jonathan Williams	4722062a36	Friend: Prevent display of staff servers to non-staff. Prevent display of CUST servers from everyone.	2014-11-05 14:44:25 -08:00
Jonathan Williams	4254225462	CoinBombs and GemBombs now queue their amounts to prevent excessive database calls. Removed excess account row information retrieval on web api when awarding gems/coins. Added account specific transactional locks in webapi.	2014-11-05 14:42:11 -08:00
Jonathan Williams	1a09c14642	Reverted database connection pooling because it caused severe login delays.	2014-11-05 14:39:22 -08:00
Chiss	a66c3486d3	fixed bug in foot particle.	2014-11-05 11:35:52 +11:00
Chiss	b00fb0952a	Updated Sheep Quest to be 1.8 comptible. Fixed fissure not working on slabs Fixed a bug in recharge Added ability for admins to give other people creative (they lose it when the admin quits)	2014-11-05 11:26:39 +11:00
Chiss	3a6968a60b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-04 19:17:21 +11:00
Chiss	f6df7705b1	- Added 3 kits for DMT - Added achievement kit for OITQ/Sneaky Assassins/DMT - Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins) - Various improvements/fixes for Champions - Nerfed trollability of Digger kit in DE	2014-11-04 19:17:06 +11:00
Shaun Bennett	174b1f43c4	GiveItem Fixes	2014-11-03 18:24:56 -06:00
Shaun Bennett	50ea13910a	Change GiveItem command to Dev+	2014-11-03 10:26:08 -06:00
Jonathan Williams	30a1df1473	Fix for null pointer in particle foot.	2014-11-01 02:38:59 -07:00
Jonathan Williams	d64e8c5162	Added max of 10 connections for db pool.	2014-11-01 02:35:36 -07:00
Jonathan Williams	86fb78e34c	minor Unused code cleanup	2014-10-31 23:32:59 -07:00
Jonathan Williams	fa0049d22a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-31 23:01:15 -07:00
Jonathan Williams	f206441999	Fix partial commit.	2014-10-31 23:00:53 -07:00
Jonathan Williams	c85ba72730	Added null check for dragooon. Added two treasure keys for halloween give away.	2014-10-31 23:00:13 -07:00
CoderTim	f3770933b6	Merge branch 'feature/database-pool'	2014-11-01 01:59:07 -04:00
Chiss	0095a03df7	returned bridges to normal	2014-11-01 11:11:35 +11:00
Chiss	83d182db2e	Fixed Villager exploit! oops Some balance stuff in champs	2014-11-01 08:38:36 +11:00
Chiss	b5ef46007f	updated npc info	2014-10-31 18:17:12 +11:00
Chiss	de08456093	fixed error in block restore	2014-10-31 10:47:18 +11:00
Chiss	aca18bb2e7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-31 10:36:06 +11:00
Chiss	aa45f031ac	3 new achievement Kits SSM Balance patch Champs balance tons of bug fixes	2014-10-31 10:35:47 +11:00
CoderTim	cc8912b27e	Added NPC info messages to NpcManager	2014-10-30 18:20:21 -04:00
CoderTim	50a457ba51	Database pool tweaks	2014-10-29 19:13:28 -04:00
CoderTim	4fc291ea80	Everything but Mineplexer using database pool	2014-10-29 18:43:21 -04:00
CoderTim	5244f65d8f	All connections to db.mineplex.com/Account use database pool	2014-10-29 17:54:40 -04:00
Shaun Bennett	9819b6c10a	Merge remote-tracking branch 'origin/master'	2014-10-27 20:25:47 -05:00
Shaun Bennett	054c26dfbc	New Coin/Gem Command	2014-10-27 19:59:30 -05:00
Shaun Bennett	01d44cd250	Give Item Command	2014-10-27 19:25:59 -05:00
CoderTim	f0ba562265	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-27 18:11:29 -04:00
CoderTim	9f8b119fb7	Bug fixes	2014-10-27 18:09:23 -04:00
Jonathan Williams	006e20bb13	Prevent more than 5 players from being processed at a time on server connect.	2014-10-27 04:35:05 -07:00
Jonathan Williams	e926fc1f10	Fixed TransferCommand	2014-10-27 04:34:35 -07:00
CoderTim	a1c4b8840f	NpcManager no longer uses database connection pool	2014-10-25 16:51:58 -04:00
Chiss	849d5f1471	lowered gem rewards for MS a little	2014-10-25 18:37:18 +11:00
Chiss	bd2e7faf3e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-25 13:40:53 +11:00
Chiss	4002528c51	Updated GUI text. - recharges/etc now use bottom text - uses appropriate bottom/top for 1.7 or 1.8 - fixed 1.7 dragon bar so it works as it did pre-1.8 - dragon bar in 1.8 will now send dragon+wither, for more reliability - renamed utils to be more clear	2014-10-25 13:40:34 +11:00
Shaun Bennett	5cf3e6c3a1	Fix for arcade custom tags	2014-10-24 19:36:22 -05:00
Chiss	25fc3c0645	Achievement Kits (3 games) Halloween Pumpkins Youtube command (allows kits)	2014-10-24 19:05:57 +11:00
Jonathan Williams	27dc9f7693	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-23 23:58:24 -07:00
Jonathan Williams	d4900c38b1	Halloween server max. CustomTagFix fix for invis armor stand on your own head.	2014-10-23 23:58:13 -07:00
CoderTim	f52a89d2ca	NpcManager teleports slimes correctly	2014-10-20 18:19:19 -04:00
CoderTim	db3354176c	NpcManager stores test server NPCs under a different server name	2014-10-20 18:08:28 -04:00
Jonathan Williams	8630a1ba4c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-17 23:39:21 -05:00
Jonathan Williams	e3cd6f0e69	Fixed Mem leak in CustomTagFix Changed to ServerGameMenu Fix for overfilling HH servers Added staff ability to join all servers.	2014-10-17 23:29:24 -05:00
Chiss	075bc0af1d	Added gem rewards for MS achievements	2014-10-17 21:20:04 +11:00
Jonathan Williams	2bbb29c8bb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-17 02:57:30 -05:00
Chiss	f5efea1e9a	Missing files	2014-10-17 18:34:23 +11:00
Jonathan Williams	6d38f4e238	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-17 00:42:01 -05:00
Jonathan Williams	8466b8e2dd	Fixed building issues with EnjinTranslator MAde mysql repo always record rank change even if windows return rank is different. Added rough single player replay functionality.	2014-10-17 00:41:23 -05:00
CoderTim	248438535b	Preserve pitch and yaw in NpcManager teleportations	2014-10-16 22:31:09 -04:00
CoderTim	930cdf6c07	Hide NpcManager blank custom names	2014-10-16 22:24:24 -04:00
CoderTim	edb2c4f26a	Merge remote-tracking branch 'origin/master'	2014-10-16 22:15:20 -04:00
CoderTim	1fb21d6143	Fixed some NpcManager bugs	2014-10-16 22:13:41 -04:00
Shaun Bennett	ec81e9f511	Merge remote-tracking branch 'origin/master' Conflicts: Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java	2014-10-16 17:51:32 -05:00
Shaun Bennett	c855c46940	Add coin command for online players, better way to handle this soon	2014-10-16 17:46:00 -05:00
Chiss	c30171d24f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-16 12:03:09 +11:00
CoderTim	233e6d0b46	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-15 20:44:50 -04:00
CoderTim	535506393f	Added ability to customize NPC zombie adulthood, slime size, and villager profession	2014-10-15 20:44:42 -04:00
Shaun Bennett	76dc735b6b	Fix bug I was getting with ShopItem	2014-10-15 15:05:31 -05:00
Chiss	82e95f714a	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-15 16:57:38 +11:00
Chiss	b83b0e61e6	fixed long lines in achievements added night to halloween maps in parser	2014-10-15 16:57:25 +11:00
Jonathan Williams	a6a4808222	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-15 00:27:01 -05:00
Jonathan Williams	a81bdb4e32	Fixed bug with armor stands showing up for customNameVisible = false;	2014-10-15 00:26:36 -05:00
Chiss	c3fdae135e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-15 16:11:08 +11:00
CoderTim	25b10f0925	Added /npc refresh command to NpcManager	2014-10-15 01:04:52 -04:00
CoderTim	ed64c1972d	Update accountStats rows before inserting to prevent id column from skipping on failed inserts	2014-10-15 00:54:23 -04:00
Chiss	d8a8061746	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-15 15:44:41 +11:00
Chiss	eb5af41323	Added halloween reward pet minor bug fixes	2014-10-15 15:44:26 +11:00
CoderTim	2a18888922	Improved NpcManager to work with persistent maps	2014-10-14 22:22:17 -04:00
CoderTim	256df99b7b	Added MineStrike to achievement gui	2014-10-13 23:48:38 -04:00
CoderTim	3ba748f2de	Merge branch 'feature/currency-log'	2014-10-13 23:13:44 -04:00
Jonathan Williams	1dd51bcac5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-13 21:07:10 -05:00
Chiss	15b6a80613	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-14 13:02:17 +11:00
Chiss	ed9dd6e894	Minor patches	2014-10-14 12:42:53 +11:00
CoderTim	8f90c96019	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-13 20:45:55 -04:00
CoderTim	2016ea09cb	Added achievements to games and Achievement enum	2014-10-13 20:38:58 -04:00
Jonathan Williams	0194a041e2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-12 20:57:32 -07:00
Jonathan Williams	3e7787a354	Fix for customer support GemHunterCommand Fix for UUIDFethcer pulling while player is online.	2014-10-12 20:57:17 -07:00
Chiss	a4b85053d9	fixed bug where blockmorph was crashing hubs.	2014-10-13 14:56:19 +11:00
Chiss	25fbe24d20	improved sound output of coin bomb	2014-10-13 14:13:57 +11:00
Chiss	e41b10ccb8	minor UHC fix	2014-10-13 14:09:58 +11:00
Chiss	9cc28d1ad8	MAC Update	2014-10-12 14:19:35 +11:00
Jonathan Williams	d3788e8ddc	Fixed redis server time functions. Added kill option for servers with motd Finished in servermonitor	2014-10-11 04:40:53 -07:00
Jonathan Williams	797dd002ad	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-11 02:43:56 -07:00
Jonathan Williams	a54b78fefa	Added Mine-Strike to Quick Game menu. Fixed up CoreClientManager's rank update.	2014-10-11 02:32:02 -07:00
Jonathan Williams	19afebe53d	Added in mysql hooks for coins/gems/ranks for database conversion preperation. Added in failover database calls in CoreClient/DonationManager	2014-10-11 01:32:22 -07:00
CoderTim	3422f48325	New acheivements	2014-10-10 21:49:03 -04:00
Chiss	ffc2ff5058	Modifided output of friends list - buttons to left side for alignment - sorted by sent>offline>pending>online - improved 'no friends' message	2014-10-09 12:15:45 +11:00
Chiss	7a345dce95	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-05 13:40:15 +11:00
Chiss	d3f87dff46	MineStrike update	2014-10-05 13:37:27 +11:00
Jonathan Williams	bf11635616	Fixed GemHunter in StaffServer and added offline stat increment :)	2014-10-04 15:43:33 -07:00
Shaun Bennett	39b03b7533	Change time command to mod+	2014-10-04 00:20:35 -05:00
Shaun Bennett	520ade8249	Merge remote-tracking branch 'origin/master'	2014-10-03 20:41:06 -05:00
Shaun Bennett	ef82aa08b1	Time command for mod+	2014-10-03 20:40:58 -05:00
Jonathan Williams	66457ded60	Fix initial friends date load for offline time.	2014-10-03 02:05:55 -07:00
Jonathan Williams	9033843a31	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-03 01:50:35 -07:00
Jonathan Williams	c641eab3c7	Fixed up friends.	2014-10-03 01:50:23 -07:00
CoderTim	b78132ebfc	Renamed NpcManager methods	2014-10-02 22:18:25 -04:00
CoderTim	addc423c2d	Added /npc clear back	2014-10-02 22:15:12 -04:00
CoderTim	f6f484c134	Refactored /npc commands	2014-10-02 22:08:00 -04:00
Shaun Bennett	4253c08682	Fix time	2014-10-02 20:25:50 -05:00
Shaun Bennett	a6fea938b9	Fix some duplicate code	2014-10-02 20:01:33 -05:00
Shaun Bennett	07576a2b12	Add gamesplayed and timeingame to gui	2014-10-02 19:48:25 -05:00
Jonathan Williams	9b2a2cbbd6	Fixed mounting blocks on yourself in 1.8 Added temp fix so 1.8 players can ride dragons again. Removed Block form in parkour and fly for block form.	2014-10-01 02:12:11 -07:00
Jonathan Williams	c2b84cc60f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-30 12:20:14 -07:00
Jonathan Williams	0228ef5921	Staff server work to include treasure chests/keys and gem hunter level 8, 12.	2014-09-30 12:20:01 -07:00
CoderTim	a5a2c1a837	Partially done refactoring NpcManager	2014-09-30 11:03:23 -04:00
Shaun Bennett	c7d34e70ef	Merge remote-tracking branch 'origin/master'	2014-09-29 17:42:13 -05:00
Shaun Bennett	92f8dc7f61	Add velocity toggle for mod+	2014-09-29 17:17:02 -05:00
Shaun Bennett	7892c442d0	Add show mac reports user pref for mod+	2014-09-29 11:14:20 -05:00
CoderTim	578b5702bc	Added commons-dbcp2.jar dependency to Mineplex.Core in eclipse	2014-09-27 04:18:19 -04:00
Jonathan Williams	eaee6c2733	AWork on FRiends.	2014-09-26 12:38:51 -07:00
Jonathan Williams	34baa8eafb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-25 23:27:19 -07:00
Jonathan Williams	8bca23f0ba	Fixed bug with custom tag fix :P Fixed bug with server group up time check in servermonitor.	2014-09-25 23:27:08 -07:00
Shaun Bennett	7ee4f549f8	Merge remote-tracking branch 'origin/master'	2014-09-25 18:04:06 -05:00
MrTwiggy	fc98cf4f6c	Add callback feature set for cross-server command system to reduce dependencies, clean up old constant references and add in ability to initialize server name on ServerData. Clean up old 'this' references to '_' prefixed variables and standardize field naming.	2014-09-25 17:17:38 -04:00
CoderTim	ba2f0e37ef	Log changes in players' coins to database	2014-09-25 17:03:26 -04:00
Jonathan Williams	91ca7fa6c6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-25 05:37:21 -07:00
Chiss	79e808814a	Minestrike cleans up incendiary at the end of rounds	2014-09-25 20:52:13 +10:00
Jonathan Williams	1f0bd462e3	Fix for CustomTagFix leak.	2014-09-24 22:14:26 -07:00
Shaun Bennett	f5c8b2b1ac	Fix renaming pets for 1.8 clients	2014-09-24 22:31:09 -05:00
Shaun Bennett	57487e78cf	Fix Gem Booster display bug	2014-09-24 21:59:25 -05:00
Jonathan Williams	a54a2aadc0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-24 01:32:03 -07:00
Jonathan Williams	d32085f05b	Removed tab list stuff for friends. Implemented rudimentary friends chat list. removed unused code in server stuff. Added null check for retrieving server statuses.	2014-09-24 01:31:56 -07:00
Chiss	969c7c0fde	Music gadget fixes Tournament point tally Removed snow from frosty HorseMount Added Tournament hub invite messages	2014-09-24 15:46:55 +10:00
Chiss	5774de552d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-22 17:53:39 +10:00
Chiss	a58335d906	Added GameStatManager.java	2014-09-22 17:46:36 +10:00
CoderTim	77e21c0d99	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-22 02:53:55 -04:00
MrTwiggy	5c9ee3e79e	Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers.	2014-09-21 20:42:47 -04:00
CoderTim	1949de4fd7	Database implementation of NpcManager partially complete	2014-09-21 15:45:15 -04:00
Chiss	a830c72d22	Jukebox will be removed.	2014-09-20 15:29:59 +10:00
Chiss	be3e10a412	Treasure now reverts BlockRestore changes before changing blocks. Prevents artifact blocks being left behind.	2014-09-20 09:31:06 +10:00
Chiss	0d090d7bdc	fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale added lore to coins in GUI, to help new players and sell more ranks slightly lowered hitbox for headshots in minestrike	2014-09-20 09:10:55 +10:00
Chiss	9bbac7578e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java	2014-09-20 08:29:06 +10:00
Jonathan Williams	960b0aa69e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java	2014-09-19 09:23:52 -10:00
Shaun Bennett	ed85779876	Fix Treasure painball gun issue, fix parkour paintbull gun issue	2014-09-19 14:18:23 -05:00
Jonathan Williams	96498af626	Fixed parkour bug with gadget blocks. Removed a ton of debug messages with inventory close.	2014-09-19 09:06:42 -10:00
Jonathan Williams	d0edde9dbd	Added rank benefit giver 9000 Added MineStrike to beta timer. Updated official craftbukkit.jar	2014-09-19 02:57:35 -10:00
Jonathan Williams	c8e755fe5f	Reverted and merged twigs status update. (Needs fix on startDate.)	2014-09-18 22:22:01 -10:00
Jonathan Williams	239b021b0d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-18 22:03:49 -10:00
Chiss	91037384f9	Loot tweaks Music fixes some bug fixes	2014-09-19 18:01:38 +10:00
Jonathan Williams	7906f48262	Updated CoreClientManager to pull all account data via name request. Cleaned up some code with pet administrator. added logging if 0 rows were being saved in CommitChanges	2014-09-18 21:12:37 -10:00
Shaun Bennett	5c791090fc	Open all treasures after 60 seconds	2014-09-19 00:48:11 -05:00
Shaun Bennett	3d04b27898	Prevent Gadget block changes from affecting treasure	2014-09-18 23:03:08 -05:00
Shaun Bennett	1a9f676a61	Merge remote-tracking branch 'origin/master'	2014-09-18 22:41:32 -05:00
Shaun Bennett	3eb61135c9	Fix treasure message	2014-09-18 22:39:42 -05:00
Chiss	01a6ff6069	costume reward fix hub builder including database	2014-09-19 13:01:49 +10:00
Shaun Bennett	1370a0eeac	Clean up RewardRarity	2014-09-18 21:24:14 -05:00
Shaun Bennett	aad3d59177	Merge remote-tracking branch 'origin/master'	2014-09-18 21:03:59 -05:00
Shaun Bennett	5d643c00d5	treasssssurreeeeees	2014-09-18 21:03:46 -05:00
Chiss	27587a2a11	fixed players being able to be pushed into portals by gadgets	2014-09-19 11:15:48 +10:00
Chiss	a0e9d6f6fd	fixed a portal break bug reduced lag from coin bomb	2014-09-19 10:59:26 +10:00
Chiss	4b602c1b83	Inventory Update added Jooq to Hub build	2014-09-19 10:36:41 +10:00
Shaun Bennett	c93fee2b53	Fix typos for pets	2014-09-18 18:10:33 -05:00
Shaun Bennett	ee64ff2bf6	Dispose of Shop if the InventoryOpenEvent gets cancelled	2014-09-18 17:48:35 -05:00
Shaun Bennett	2008dae57b	Adjust treasure message	2014-09-18 17:38:05 -05:00
Shaun Bennett	51ad6d8368	Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes	2014-09-18 17:33:05 -05:00
Shaun Bennett	b8d157f99f	Add costumes to RewardManager	2014-09-18 14:47:22 -05:00
Shaun Bennett	76df00978a	Add music discs to RewardManager	2014-09-18 14:43:07 -05:00
Shaun Bennett	88a8e3a896	Hackyish way to log rewards given out in a database	2014-09-18 14:35:59 -05:00
Chiss	ed59e03795	Loot update	2014-09-18 17:05:56 +10:00
Shaun Bennett	e5d5cda9fd	Merge remote-tracking branch 'origin/master'	2014-09-18 00:46:41 -05:00
Shaun Bennett	87bd5d8f7f	Add coin party bomb to rare rewards, fix reward values from last commit	2014-09-18 00:46:33 -05:00
Chiss	3fd312ff95	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-18 15:45:01 +10:00
Chiss	fed3d31374	MineStrike fixes	2014-09-18 15:44:48 +10:00
Shaun Bennett	6c4479298d	Fix RewardManager bug, fooling around with animations	2014-09-18 00:41:56 -05:00
Shaun Bennett	9d0b99b7fc	Merge remote-tracking branch 'origin/master' Conflicts: Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java	2014-09-17 23:56:42 -05:00
Chiss	09a3cc16b0	Reward stuffs	2014-09-18 14:36:22 +10:00
Chiss	bb8e481c7f	More Reward stuff	2014-09-18 14:25:39 +10:00
Chiss	c625fb4121	Restructured rewards for Post-Game rewards	2014-09-18 13:21:30 +10:00
Shaun Bennett	33d33f84b4	More treasure animation touches + fixes	2014-09-17 15:22:54 -05:00
Shaun Bennett	da680359d0	Change formatting of treasure announcements	2014-09-17 14:50:34 -05:00
Shaun Bennett	90e402bf69	Fix menu slots	2014-09-17 14:43:58 -05:00
Shaun Bennett	0139e40957	Re-enable Coin Party Bomb reward for rare treasures	2014-09-17 14:35:43 -05:00
Shaun Bennett	cc5db5939d	Add Music and Costume pages to cosmetic menu	2014-09-17 14:34:57 -05:00
Chiss	8780d5e4ee	MS fixes	2014-09-17 11:18:59 +10:00
Chiss	16214613fe	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-17 08:59:23 +10:00
Chiss	e6797582f9	Minor fixes	2014-09-17 08:59:09 +10:00
Shaun Bennett	50fa8b02f1	Use explosion particles instead of createExplosion	2014-09-16 17:57:34 -05:00
Shaun Bennett	918a817283	More treasure bug fixes and animation touches	2014-09-16 15:04:42 -05:00
CoderTim	d5313540d7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-15 23:32:04 -04:00
CoderTim	c5ff9da552	Record basic game stats (game type, timestamp, duration, winners, losers)	2014-09-15 23:31:53 -04:00
Shaun Bennett	5b77fa09a4	Merge remote-tracking branch 'origin/master'	2014-09-15 19:37:28 -05:00
CoderTim	1b416d3e6f	Added database tables to record basic game stats	2014-09-15 16:36:59 -04:00
Shaun Bennett	63b3621ae3	Fix treasure open chest bug, added some animation touches	2014-09-15 13:34:21 -05:00
MrTwiggy	abea4223ab	Recommit up-time checking to prevent brand new empty servers from being prematurely killed by ServerMonitor.	2014-09-15 13:22:11 -04:00
Shaun Bennett	7c18e89249	Send chest open packets for new players that join in the middle of a treasure	2014-09-15 10:37:40 -05:00
Jonathan Williams	c7e0ebefd1	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-13 20:52:13 -10:00
Jonathan Williams	a395cae764	Fixes for Custom tag Fix for Bridge time Fix for tournament auto whitelist. Added UI stuf for tourney Added build files for arcade.	2014-09-13 20:50:27 -10:00
Shaun Bennett	c1bc9fca2e	Small treasure tweaks	2014-09-14 00:29:30 -05:00
Shaun Bennett	fc44592edf	Merge remote-tracking branch 'origin/master'	2014-09-13 23:07:21 -05:00
Shaun Bennett	228cca4805	fix bug with reward amounts	2014-09-13 23:07:15 -05:00
Jonathan Williams	7ad7dd939d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-12 22:00:18 -10:00
Jonathan Williams	1c3326333d	Fix for crash.	2014-09-12 21:59:12 -10:00
Jonathan Williams	4f5430e390	Added tournament stuff.	2014-09-12 21:52:44 -10:00
Chiss	e31ab1b37a	disabled treasure again!	2014-09-13 16:44:51 +10:00
Chiss	054709a859	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java	2014-09-13 16:44:11 +10:00
Chiss	31c4a95da5	Disabled Treasure Chests	2014-09-13 16:43:18 +10:00
Shaun Bennett	1e7ed8d491	Treasure rewards + some minor fixes	2014-09-13 01:25:14 -05:00
Jonathan Williams	a196e43fde	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java	2014-09-12 19:46:19 -10:00
Shaun Bennett	0afb0f061c	Changes to fireworks animation	2014-09-12 23:43:38 -05:00
Shaun Bennett	aafdc555b1	Oops, accidentally removed some code!	2014-09-12 23:41:50 -05:00
Shaun Bennett	0f44850367	Treasure stuff	2014-09-12 23:30:00 -05:00
Shaun Bennett	5e9cbcef75	Merge remote-tracking branch 'origin/master'	2014-09-12 23:15:58 -05:00
Shaun Bennett	71f42c6e7b	Treasure updates	2014-09-12 23:15:53 -05:00
Chiss	a31e20d709	treasure styles	2014-09-13 14:09:50 +10:00
Chiss	4454627b32	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-13 13:41:48 +10:00
Chiss	e511df4605	Merge treasure	2014-09-13 13:41:37 +10:00
Shaun Bennett	fc6a2633c9	Remove debug message, make sure player is far enough from spawn to open treasure	2014-09-12 22:41:10 -05:00
Shaun Bennett	a8eeef02dd	Adjustments to how treasure rewards are selected	2014-09-12 22:33:22 -05:00
Jonathan Williams	14c4152248	Fixed CustomTagFix. Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.	2014-09-12 10:03:33 -10:00
Shaun Bennett	20680acea0	More treasure rewards + tweaks	2014-09-12 14:24:30 -05:00
Shaun Bennett	dea6c98fc9	Merge remote-tracking branch 'origin/master'	2014-09-12 14:08:22 -05:00
Shaun Bennett	4ea786a1a5	Fix fireworks for 1.8 client, a bunch more treasure stuff	2014-09-12 14:08:10 -05:00
Chiss	5de59b6e0e	Hub UHC countdown basics UHC MOTD timer stuff	2014-09-12 18:06:51 +10:00
Chiss	0dff0412d1	Fixed game flag for not allowing inventory opens Removed some redundant flags in game Lots of MineStrike updates Fixed NPE in WinWithoutLosingTeammateStatTracker	2014-09-12 11:47:39 +10:00
Shaun Bennett	b910c5098c	Cross version Holograms (Alignment might be a tad off) A bunch of stuff for Treasure Chests	2014-09-10 12:16:31 -05:00
Shaun Bennett	32bbecd01a	Merge remote-tracking branch 'origin/master'	2014-09-09 19:27:16 -05:00
Shaun Bennett	c4ad00bef1	add armor stand hologram, just to send code to laptop	2014-09-09 19:27:05 -05:00
Shaun Bennett	652075138e	More treasure rewards work	2014-09-08 13:26:18 -05:00
Chiss	347e2b1bf5	Changed FIRE items to Blaze Powder	2014-09-08 10:14:55 +10:00
CoderTim	3e5b827a7f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-07 18:10:31 -04:00
CoderTim	201782a7cd	Added leaderboard.php	2014-09-07 18:09:46 -04:00
Shaun Bennett	6441b110b4	Treasure stuff from laptop	2014-09-07 13:35:49 -05:00
Jonathan Williams	558231457c	Fixed disguises leaving extra tags Fixed memory problem in Arcade.	2014-09-06 03:39:20 -07:00
Shaun Bennett	86d063dafb	Merge remote-tracking branch 'origin/master'	2014-09-06 01:07:49 -05:00
Shaun Bennett	15b46e8f96	Fix displaying on stats on achievement gui	2014-09-06 01:07:40 -05:00
Chiss	644d3da050	JOOQ for Eclipse	2014-09-06 11:31:55 +10:00
Shaun Bennett	eb27c1dfbe	Add Util class for sending titles to players	2014-09-05 19:46:11 -05:00
Jonathan Williams	2f8b53f771	Fix for customer support server. Fix for Boss bar junk. Fix for Disguises.	2014-09-05 14:36:10 -07:00
Jonathan Williams	d01529a344	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2014-09-05 04:38:23 -07:00
Jonathan Williams	1c6790b611	Fixed for DisguiseManager Rewrote packet handling Fixed up CustomTagFix Removed swapping kits in Block Hunt Removed Stacked entities for 1.8 players.	2014-09-05 04:36:01 -07:00
CoderTim	91a2266a04	Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking	2014-09-05 04:00:51 -04:00
Jonathan Williams	b28fc8ee6b	Added custom name tag fix for mobs for 1.8 players Worked on boss bar display. Bug with <=50% hp.	2014-09-04 11:33:51 -07:00
Shaun Bennett	e7f79aa5bf	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00
Jonathan Williams	92191dc19a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java	2014-09-03 03:47:15 -07:00
Jonathan Williams	a4871b5509	Updated to latest spigot with 1.8 support. Tweaked disguise manager for 1.8 support. Work on CUstomer support server + admin stuff.	2014-09-03 03:46:24 -07:00
Shaun Bennett	08e6b73b1f	Disable Treasure stuff for now	2014-09-02 19:04:43 -05:00
Shaun Bennett	2b3f6c9dbc	Prevent minecart mounts from being broken by others	2014-09-02 19:03:14 -05:00
Shaun Bennett	2d5c676e1b	Merge remote-tracking branch 'origin/master'	2014-09-02 18:57:35 -05:00
Shaun Bennett	4ad034b8d9	more treasure stuff, really basic holograms	2014-09-02 18:33:40 -05:00
Chiss	05623b7522	Initial MineStrike push fixed frames being breakable in games	2014-09-01 21:37:39 +10:00
Jonathan Williams	8198bb31c8	Added sneaking to player disguise. Did work on DDoSProtectionSwitcher Work on AccountAdministrator to fix rank issues.	2014-09-01 00:56:32 -07:00
Shaun Bennett	5905ef5ef7	Treasure Stuff	2014-08-30 14:27:11 -05:00
Jonathan Williams	c8bc697888	Fixed mounts and gadgets for rank messages...no Purchase.	2014-08-30 02:37:27 -07:00
Jonathan Williams	f6dcebc3dc	Fixed extra spacing in cosmetic menu.	2014-08-30 02:33:37 -07:00
Jonathan Williams	72aa05f73e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-30 02:26:16 -07:00
Jonathan Williams	829736ed07	Fixed purchase info.	2014-08-30 02:26:07 -07:00
Shaun Bennett	e52f6deab4	Merge remote-tracking branch 'origin/master'	2014-08-30 04:24:34 -05:00
Shaun Bennett	6a58b86a19	Don't display wins and losses to other players on Achievement Gui	2014-08-30 04:24:25 -05:00
Jonathan Williams	b07670f6af	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-30 02:04:32 -07:00
Jonathan Williams	1bd0209b39	Added multi-server tags for npcs Fixed Customer support packages. Fixed Account rank expire for Hero Added SNR mod to update Rank Changed SNR mod color to gray.	2014-08-30 02:04:04 -07:00
Chiss	41daba98c4	Background work for Minestrike Admins no longer have OP in hubs. They have /gm command to gamemode.	2014-08-29 18:21:08 +10:00
Chiss	1f6b9374eb	disable le minestrike	2014-08-29 11:55:06 +10:00
Chiss	c3bb0ddbcb	Chest example gadget for shauny	2014-08-29 11:00:16 +10:00
Jonathan Williams	409e2c6141	Tweaked menus for quick game, Cosmetic menu. Removed debug for Hub Output a little debug info in LobbyBalancer Added duplicate check to ServerMonitor updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra	2014-08-28 14:01:37 -07:00
Jonathan Williams	526ca42add	Fixed Gem booster problem. FIxed stat problem.	2014-08-27 12:48:24 -07:00
Chiss	311711f2f0	Disabled fireworks for non-gadget enderpearls.	2014-08-27 15:24:10 +10:00
Chiss	9cde497a5c	Fixed ethereal pearl text	2014-08-27 15:20:55 +10:00
Chiss	9439daa852	Fixed bug where spectators could trigger anti-cheat in bridges	2014-08-27 15:16:20 +10:00
Chiss	596bcbfae6	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-27 14:23:01 +10:00
Chiss	da5f953212	Fixed BlockMorph leaving blocks behind when player was teleported.	2014-08-27 14:22:35 +10:00
Shaun Bennett	8439838328	After years of research and experimenting, we settled on an achievement icon	2014-08-26 19:01:59 -05:00
Shaun Bennett	78eee68592	Change achievement icons, fix another typo	2014-08-26 18:39:01 -05:00
Shaun Bennett	c04319345a	Merge remote-tracking branch 'origin/master'	2014-08-26 17:41:07 -05:00
Shaun Bennett	507d356346	Fix last achievement typo	2014-08-26 17:40:58 -05:00
Jonathan Williams	232785a7dd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-26 04:56:34 -07:00
Jonathan Williams	417d398195	Swapped Morph and Pet active slot. Fixed a couple things on Staff server.	2014-08-26 04:56:23 -07:00
Shaun Bennett	99951bc573	Fix achievement typos	2014-08-26 04:20:33 -05:00
Jonathan Williams	064b0e8b36	Removed sheep mount and fixed up server monitor.	2014-08-26 01:31:57 -07:00
Chiss	81e92c0e8e	changed wording in achi GUI	2014-08-26 18:24:20 +10:00
Chiss	6f1204c844	Set gem reward for all achievements	2014-08-26 18:20:33 +10:00
Chiss	ab29a5fa29	Fixed text output in Achi GUI for completed	2014-08-26 18:06:01 +10:00
Chiss	d62b59776f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-26 17:54:50 +10:00
Chiss	116fe496a8	Changed post game achievement output Added Reward to Achi GUI	2014-08-26 17:53:54 +10:00
Jonathan Williams	7a8ab5c96a	Comment for weirdness.	2014-08-26 00:53:41 -07:00
Jonathan Williams	a4cf9e2f4b	Fixed stat bugs.	2014-08-26 00:52:51 -07:00
Jonathan Williams	526b5c333a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-26 00:34:00 -07:00
Jonathan Williams	137b8692e4	Added Gem booster use.	2014-08-26 00:33:48 -07:00
Chiss	0546c9e175	Fixed so only Supply drop chests trigger achievement	2014-08-26 17:33:23 +10:00
Chiss	1b15a57fc8	Added Gem Rewards for Achievements	2014-08-26 17:10:20 +10:00
Jonathan Williams	162a86d4b2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java	2014-08-25 23:58:54 -07:00
Jonathan Williams	b8b6c031cd	Re-did and added a game to the quick game menu. Fixed npc triggers with non npcs named the same. Fixed naming pet longer than 16 chars. Added sugar cane to restricted block type for paintball gun Properly hooked in gadget block event for paitnball gun. Added auto purchase page on item gadget ammo empty. Added check on rank for customer support command. Fixed ConcurrentModificationException problem with spigot.	2014-08-25 23:56:58 -07:00
Chiss	95e7517a9e	disabled debug cmd for rave suit	2014-08-26 16:17:38 +10:00
Chiss	8fc6013ff3	Disabled Chest GUI	2014-08-26 16:12:01 +10:00
Chiss	dd61077850	Added missing Achievements	2014-08-26 14:46:10 +10:00
Chiss	1b3e32ca26	Added Arcade Achievements	2014-08-26 14:42:17 +10:00
Chiss	f0e01aa257	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-26 13:42:54 +10:00
Chiss	28d523d696	Added Achievements	2014-08-26 13:42:42 +10:00
Shaun Bennett	905d4db6f1	Use emerald instead of bed	2014-08-25 21:32:30 -05:00
Shaun Bennett	2e0b074053	More achievement gui changes	2014-08-25 20:56:21 -05:00
Chiss	07ee44508e	Missing Gadgets	2014-08-26 08:17:41 +10:00
Chiss	0e3cf67402	Some new cosmetics	2014-08-25 12:59:29 +10:00
Chiss	13eb3da0fa	Achievment gui changes	2014-08-25 09:26:01 +10:00
Shaun Bennett	ff441f2262	Merge remote-tracking branch 'origin/master' Conflicts: Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2014-08-24 16:14:29 -05:00
Shaun Bennett	2cb87b23e6	Stat Gui, Start of Treasure Gui (disabled)	2014-08-24 16:08:19 -05:00
Chiss	642f8b46b9	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-23 18:01:35 +10:00
Chiss	af9bf0727a	Fixed damage taken stat NPE Added tournament team auto-rejoin	2014-08-23 17:55:28 +10:00
Jonathan Williams	fd0c4745f8	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-23 00:40:17 -05:00
Jonathan Williams	931cb5ece8	Removed MineKart code. Fixed up DisguisePlayer Added ProfileLoader Fixed up Notch gadget.	2014-08-23 00:40:07 -05:00
Chiss	0700b9df12	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-23 15:04:55 +10:00
Chiss	3ec43f90e8	GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements	2014-08-23 15:04:43 +10:00
Jonathan Williams	a84468157c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-22 18:21:38 -05:00
Jonathan Williams	ebb4c44bdc	Tweaked player disguise.	2014-08-22 18:21:23 -05:00
Chiss	9fad775f73	More cosmetics	2014-08-23 07:50:07 +10:00
Chiss	11597285b8	Changed so it music will never be 'active'.	2014-08-23 05:36:57 +10:00
Chiss	2e031f1e4a	Added Music Gadget	2014-08-23 05:35:07 +10:00
Jonathan Williams	b67b2f04b7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-22 13:32:50 -05:00
Jonathan Williams	13b90e1142	Preliminary work on help desk integration with Customer Support server. Updated DisguiseSheep with values from craftbukkit.jar	2014-08-22 13:32:22 -05:00
Chiss	a159f04d50	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-23 04:30:52 +10:00
Chiss	231ef2bbe1	Cosmetic Update	2014-08-23 04:30:41 +10:00
Jonathan Williams	83b3e49151	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-22 10:48:27 -05:00
Jonathan Williams	70217fe957	Finished first release of Customer Support plugin.	2014-08-22 10:47:46 -05:00
Chiss	0022586e3e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-22 17:08:29 +10:00
Chiss	97c087a28d	Allowed commands to specify specific ranks allowed youtube/build to start/set games	2014-08-22 17:05:14 +10:00
Jonathan Williams	99d15d3ece	Work on Customer support server.	2014-08-21 15:55:09 -05:00
Jonathan Williams	830eeca835	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-20 20:14:32 -05:00
Chiss	60869d114e	Dragon Escape changes	2014-08-20 15:45:10 +10:00
Jonathan Williams	217ab51b40	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-19 22:24:16 -05:00
Shaun Bennett	a7bb84be0b	Revert chris' revert	2014-08-19 21:24:49 -05:00
Shaun Bennett	f60a818e6a	Update craftbukkit to remove the extra _INVALID mappings	2014-08-19 21:22:04 -05:00
Jonathan Williams	24f984a365	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-19 21:37:11 -04:00
Jonathan Williams	9ee25c6292	Did some cleanup in Pvp project. Did work in Coreclient manager and added StaffServer (still in progress)	2014-08-19 21:36:23 -04:00
Chiss	94e5eb03da	Fixed errors for new getPlayers method.	2014-08-20 10:43:56 +10:00
Shaun Bennett	e1a57a673e	Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors	2014-08-19 16:58:55 -05:00
Jonathan Williams	d73ffcccfd	Added performance logging in ServerMonitor Added date tracking for gem/coin/account transactions in preparation for Customer Support server.	2014-08-18 15:46:23 -04:00
Shaun Bennett	43fd604695	Queue up polls for players instead of constantly checking for next poll	2014-08-17 17:47:38 -05:00
Jonathan Williams	8aec9e345e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-16 01:37:17 -05:00
Jonathan Williams	df97873d32	Fixed index issue with lobby balancer Added performance output for server monitor. Removed logging of debug stuff.	2014-08-16 01:37:06 -05:00
Chiss	d8123795aa	changed the way disguises show rank.	2014-08-16 16:33:18 +10:00
Chiss	a888d4f14b	Fixed leaks	2014-08-16 15:39:02 +10:00
CoderTim	ae6cb4aa22	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-15 15:56:44 -04:00
CoderTim	19222c6815	Updated IntelliJ environment to be compatible with latest changes	2014-08-15 15:51:29 -04:00
Ty	3c4c537998	Fix issue where broken Jedis instances were returned as functional instances.	2014-08-15 14:49:01 -04:00
Chiss	697897b967	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-15 09:49:12 +10:00
Chiss	85522cddca	Debug (will clean once fixed) Game stats	2014-08-15 09:49:00 +10:00
Jonathan Williams	846c75453c	Revamping Redis Server status so it uses a consistent time value from redis database.	2014-08-14 07:41:04 -05:00
Jonathan Williams	cacf736f4f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-14 04:10:21 -05:00
Jonathan Williams	682735e994	Added build fixes for ServerMonitor.java Added redis fixes for ServerMonitor Added ServerStatusManager fixes.	2014-08-14 04:10:11 -05:00
Chiss	74435bac12	fixed bug where players kept inventory open, to be able to enable morphs ingame.	2014-08-14 17:31:14 +10:00
Chiss	c72f4b6057	Dragon target cancel fix	2014-08-14 12:35:49 +10:00
Chiss	b21ae8ef72	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-14 10:32:52 +10:00
Chiss	7a3bba45a7	Mergey!	2014-08-14 10:32:41 +10:00
Jonathan Williams	27032ac2ed	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java Plugins/Mineplex.Core/src/mineplex/core/portal/PortalRepository.java	2014-08-13 18:59:59 -05:00
Jonathan Williams	6039168601	Updated code base to build #1604 spigot	2014-08-13 18:57:37 -05:00
Ty	4b4f43ac16	Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.	2014-08-13 16:37:05 -04:00
Ty	1bbb42214d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-12 11:14:53 -04:00
Ty	5b059e96ca	Commit missing PortalRepository.java file and finish clean() method.	2014-08-12 11:14:31 -04:00
Chiss	95394c51cc	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-12 11:24:12 +10:00
Chiss	2d67d4ce36	Achievement fix + active	2014-08-12 11:23:53 +10:00
Ty	36d6a58e0a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java	2014-08-11 15:39:56 -04:00
Shaun Bennett	d63137ead2	Merge remote-tracking branch 'origin/master'	2014-08-11 12:44:28 -05:00
Shaun Bennett	4006c454c3	Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page)	2014-08-11 12:39:26 -05:00
Shaun Bennett	482b964580	Display particles when shouldDisplay() is true instead of false	2014-08-11 12:30:03 -05:00
Shaun Bennett	7e93ed657f	Display boss bar properly while a dragon mount is spawned in arcade	2014-08-11 12:26:56 -05:00
Chiss	02270a9d25	TNT effect only triggers off self tnt.	2014-08-11 15:33:45 +10:00
Chiss	e4871c4988	Disabling cosmetics 5s before game starts, was having some carryover due to lag.	2014-08-11 11:55:00 +10:00
Chiss	06bcf5079b	Disabled Gem hunter (bugged?) Disabled chicken morph letting people fly	2014-08-10 18:36:18 +10:00
Chiss	25b525837f	Fixed TNT blowing up lobby when it changed to prepare.	2014-08-10 11:07:05 +10:00
Chiss	9057246ab8	Arcade Inventory fixes	2014-08-10 10:50:31 +10:00
Chiss	3533ce1b7e	Particles dont play in stealth games.	2014-08-10 01:04:53 +10:00
Chiss	53221e267e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-10 00:57:17 +10:00
Chiss	7aa017772f	Spectators will not play particle effects ALL rank no longer displays on morphs.	2014-08-10 00:55:51 +10:00
Jonathan Williams	e50c179e8d	Fixed pet tag price.	2014-08-09 09:49:00 -05:00
Jonathan Williams	43862ea6bf	Moved Particles to Admin and up only.	2014-08-09 09:44:00 -05:00
Chiss	21b89d2771	removed particle debug	2014-08-09 23:36:36 +10:00
Chiss	59859b168f	Fixed multi-morphs	2014-08-09 23:34:12 +10:00
Jonathan Williams	3ea2567079	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-09 07:41:09 -05:00
Jonathan Williams	9b75ef4f96	Fixed purchasing -2 cost gadgets.	2014-08-09 07:41:00 -05:00
Chiss	066dfbc9a9	Morph helmet fix	2014-08-09 22:38:58 +10:00
Chiss	e558796268	fixed TNT not being able to hit anyone	2014-08-09 22:16:49 +10:00
Chiss	a34ce75252	price fix	2014-08-09 22:02:40 +10:00
Chiss	6c847e78b7	Gem Hunter exp change	2014-08-09 20:16:21 +10:00
Chiss	06a444bae6	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-09 19:55:35 +10:00
Chiss	ff6ea3c798	Added Cosmetics to Arcade Set prices on cosmetics	2014-08-09 19:55:05 +10:00
Jonathan Williams	b0f6435661	Fixed items not updating immediately.	2014-08-09 04:29:34 -05:00
Chiss	951e1df3d5	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-09 19:05:34 +10:00
Jonathan Williams	8fe4e39207	Split up Cosmetic shop and Inventory Added Ammo purchase for item gadgets.	2014-08-09 03:57:56 -05:00
Chiss	62eccbcc1e	Snr Mod Creeper knockbak changes	2014-08-09 15:06:00 +10:00
Chiss	91a79f0345	Pig Morph Morphs have tags/	2014-08-09 14:57:01 +10:00
Jonathan Williams	3f54881a3e	Fixed multiple purchase of Gem Booster.	2014-08-08 23:06:16 -05:00
Jonathan Williams	6bd9273edf	Refactored getting item count for ClientInventory Fixed up Arcade gem boosters so they are hooked into inventory. Cleaned up unused code.	2014-08-08 22:10:02 -05:00
Chiss	db90bcc958	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-09 12:16:53 +10:00
Chiss	313f675ae4	Hub Parkour update Smash kit prices	2014-08-09 12:16:37 +10:00
Jonathan Williams	e7847cc495	Tweaked Gem booster description.	2014-08-08 20:50:07 -05:00
Jonathan Williams	bed2545b04	Added back buttons for sub menus. Added Gem booster pack and booster count display. Added reason and admin to mute message Fixed inventory tracking.	2014-08-08 20:48:15 -05:00
Ty	ecb0b2d3bb	Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL.	2014-08-08 17:35:37 -04:00
Chiss	02dd579844	Text change for Inventory Menu	2014-08-08 17:16:20 +10:00
Jonathan Williams	e1be732202	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java	2014-08-08 02:07:20 -05:00
Jonathan Williams	9f2a83c956	Added Coins to donation. Fixed order of gadgets, mounts, pets, morphs, particles. Fixed display of active pet in Menu Fixed coins purchase for most items. Added Coins reward for ENjinTranslator. Added Coin transactions.	2014-08-08 02:05:58 -05:00
Chiss	fa3695be4e	Gem Booster In Lobby Achievement Stuff	2014-08-08 17:05:11 +10:00
Chiss	8f72ba4ab7	Hooked in statchangeevent	2014-08-08 13:53:58 +10:00
Chiss	1a33dbb5ee	Achievement Module Gem Booster/Achivement	2014-08-08 13:46:35 +10:00
Jonathan Williams	e051c1d62c	Work on inventoryManager and Enjin translator.	2014-08-07 21:22:18 -05:00
Jonathan Williams	5d89d1f728	Fixed gadget adding/removing from hotbar Fixed stats manager _stats not initializing Optimized saving call.	2014-08-07 01:46:10 -07:00
Jonathan Williams	2a31bbee95	Added new gadget stuff to core. Hooked up particle page.	2014-08-07 01:20:19 -07:00
Jonathan Williams	c01fbd279d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java	2014-08-07 00:48:32 -07:00
Jonathan Williams	055e4c5895	Converted PreferencesManager to RepositoryBase	2014-08-07 00:43:54 -07:00
Jonathan Williams	6d86f403ac	Added coins Currency to web api Added coins purchase for all cosmetic items Added Stats manager Added Inventory Manager Redesigned gadgets/morph/particle/pets/mounts page and inventory.	2014-08-07 00:33:24 -07:00
Chiss	c8dfb2f02e	Parser Fixes Sneaky Stuff	2014-08-06 11:07:49 +10:00
Ty	1b7c762942	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java	2014-08-04 18:47:49 -04:00
CoderTim	39e23c16f0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-04 00:00:12 -04:00
CoderTim	ec48a59301	Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as.	2014-08-03 23:59:10 -04:00
Shaun Bennett	6d7e8072d5	Remove premium server restriction in ServerCommand	2014-08-03 13:41:14 -05:00
Ty	6a9255e97b	Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.	2014-08-01 17:56:29 -04:00
Jonathan Williams	53ce70488f	Merge pull request #1 from premium-server-menu to master * commit '95a45409a98c141a115e463e56e440b204ae2029': Use UtilPlayer and F.main for messaging Fix flashing clock (oops!) Sound effects and knockbacks! Flashing wool instead of clock for the timer Change duration of timer. Don't punish a party if the leader has ultra Lighten load on our servers, not free servers! Lore edit on clock item Place players on correct server corresponding to their rank via portals Visual clock update Fix lore messages not displaying correctly under certain circumstances Use constants for lore messages on server page Prevent free players from joining servers before time limit Deny joining Premium servers through server command without premium Fix "Click to Spectate" formatting Identify free servers from server name Add Server Menu for Premium Servers. Item lore still needs some work	2014-08-01 02:05:39 -05:00
Shaun Bennett	c2b1f2a52f	Deny joining Premium servers through server command without premium	2014-07-31 13:47:51 -05:00
Peter Miller	fb0469adfa	Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak.	2014-07-30 20:09:58 -04:00
Shaun Bennett	dcc8eaaa21	Add Server Menu for Premium Servers. Item lore still needs some work	2014-07-30 17:19:51 -05:00
Jonathan Williams	1362deca59	More work on FriendManager	2014-07-19 13:56:21 -07:00
Jonathan Williams	2ae3d89496	Fixed issue with RepositoryBase and Friend/MysqlRepo Each db call on login gets its own async after the first two account calls are finished.	2014-07-19 13:56:03 -07:00
Jonathan Williams	8b747a81e1	Fixed filter bypass	2014-07-19 13:53:14 -07:00
Jonathan Williams	3636255e8a	Fixed bug with DisguiseManager undisguising players. Temp fix for emeralds not triggering in Perk Revealer.	2014-07-14 23:48:34 -07:00
Jonathan Williams	1207ed8199	Added DDOSProtectionSwitcher email functionality mineplex.core.Server cleanup. Refactored RepositoryBase. Implemented core functionality of Friends	2014-07-14 22:58:36 -07:00
Peter Miller	58092c914a	Initial database access and method stubbing for "news" command.	2014-07-08 22:55:51 -04:00
Jonathan Williams	963c71f128	Fixed internet status stuff for bungees. Fixed new portal arg req.	2014-07-08 12:44:17 -07:00
Jonathan Williams	e6e86c2042	Updated DnsMadeEasy api. Cleaned up some bungee code. Added InternetStatus to Bungees. Fixed some portal stuff.	2014-07-08 12:20:19 -07:00
Peter Miller	ddf1a8ff74	Pointed "send" command to "AddTransferRecord" method in Portal module. Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message. Cleaned up unnecessary references.	2014-07-07 17:30:03 -04:00
Jonathan Williams	a66e877028	Cleaned up Bungee mineplexer a bit. Refactored send/server commands for Portal.	2014-07-05 10:56:20 -07:00
Jonathan Williams	c882ab1b34	Fixed portal command stuff. Removed temp code from PlayerTracker Added temp project for future ddos prot switching.	2014-07-04 23:23:19 -07:00
Jonathan Williams	e6666932aa	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-07-04 14:32:41 -07:00
Jonathan Williams	c265c7ce5c	Fixed sync db Logger.java Added temp test code in player tracker...ignore. fixed bug in dynamic server sorter.	2014-07-04 14:23:11 -07:00
CoderTim	2fb2aadf66	Merge remote-tracking branch 'origin/master'	2014-07-04 11:12:52 -04:00
Peter Miller	b56855c33c	Squished remaining concurrency/checking bugs! Happy 4th o'July!	2014-07-04 02:19:20 -04:00
Jonathan Williams	d2caf23ed7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-07-03 11:19:23 -07:00
Jonathan Williams	b058665e93	Fixed sync db calls for PlayerTracker Fixed name update with new UUID Skeleton work for Friends	2014-07-03 11:18:11 -07:00
Peter Miller	2531dd7a8f	Implementing user/serverName checks	2014-07-03 00:17:49 -04:00
Jonathan Williams	d0fafce585	Reverted change to helper only joining full, now ultras can. Added check so BETA servers cannot be joined by less than Helper. Fixed message in AccountAdministrator for rankUpdate	2014-07-02 16:59:31 -07:00
Mini-Chiss	558f79fe34	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-07-02 10:58:34 -07:00
Mini-Chiss	17c36026f6	fixed bug where player who comes first was not being added to ranks. (get nothing)	2014-07-02 10:57:30 -07:00
Peter Miller	e7832fd06c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java	2014-07-02 03:47:14 -04:00
Peter Miller	1f515565ff	Moving improved server/send command code to separate command files	2014-07-02 03:24:48 -04:00

... 15 16 17 18 19 ...

1950 Commits