3809 Commits

Author	SHA1	Message	Date
libraryaddict	23abf92722	IcePathData: Compare Material instead of integers	2015-04-03 19:37:27 +13:00
Jonathan Williams	fb4be35dfe	Let admins apply youtube rank. ... Limit Lobby count to 250.	2015-04-02 23:36:54 -07:00
libraryaddict	290767c58d	CustomExplosion: Added method to change to customdamage, added method to change the block damage differently from the entity damage	2015-04-03 19:36:47 +13:00
Jonathan Williams	437c70e548	Fixed issue with double run() call in loadClientByName.	2015-04-02 23:36:16 -07:00
libraryaddict	d5137d9ec6	UtilParticle: Added option to send own particle strings, added two particles	2015-04-03 19:35:57 +13:00
libraryaddict	05319511ff	UtilBlock: Modified getInRadius() to allow option of a hollow sphere	2015-04-03 19:34:24 +13:00
libraryaddict	6faf5011a8	Wizards: Add spells: Gust, RainbowPath, SpectralArrow, IcePrison. Remove spells: ExplosiveRune, HealingRune, LaunchRune, Launch, TeleportRune. Explosions now launch blocks. Other changes done such as modified spells.	2015-04-03 19:33:49 +13:00
Cheese	d4e8c0c9a6	Added Respawn middle screen text ... Added Champs capture point mid screen text Fixed hitbox mults for projectiles Fixed inconsistent arrow damage Lots of Champions balance	2015-04-03 15:28:10 +11:00
Cheese	f682bb8f9c	fixed kit items not spawning ... horse pet doesnt spawn when dead	2015-04-03 12:10:02 +11:00
libraryaddict	bb821996b1	Wizard modifications	2015-04-03 09:22:31 +13:00
Jonathan Williams	7a0f9d28bf	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-01 02:22:58 -07:00
Cheese	43c58bd31c	removed april fools from arcade :(	2015-04-01 20:22:13 +11:00
Jonathan Williams	24e65e7384	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-01 01:29:05 -07:00
Cheese	3355d2b457	disabled aprilfools cow for team games	2015-04-01 19:15:11 +11:00
Jonathan Williams	686f99031b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-01 00:26:30 -07:00
Cheese	5737df8d6a	final fixes for bacon brawl	2015-04-01 18:07:45 +11:00
Jonathan Williams	8d9d298f0f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-01 00:04:44 -07:00
Cheese	987bf266ee	fixed bug in moo	2015-04-01 18:02:56 +11:00
Cheese	da9e7892f0	fixed aprilfools bugs ... mamapig debug :(	2015-04-01 18:01:09 +11:00
Cheese	24ba42cb16	fixed armor stands blocking attacks in bacon brawl	2015-04-01 17:49:49 +11:00
Jonathan Williams	38798d3baf	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-31 23:47:27 -07:00
Jonathan Williams	6037da6e0f	Improved fix for coinQueue memory leak.	2015-03-31 23:47:08 -07:00
Jonathan Williams	405d0fec18	Work on FriendRepository, still not enabled yet.	2015-03-31 23:46:43 -07:00
Cheese	8bd883cb26	fixed damage transfer for mama pigglez kit	2015-04-01 17:43:46 +11:00
Cheese	31ddeaac50	a little more moo	2015-04-01 17:28:05 +11:00
Jonathan Williams	10c7d06a88	Memory leak fixes for DisguiseManager and DonationManager.	2015-03-31 23:16:15 -07:00
Cheese	59fce1cd88	adding some mmoooo text ... changed pig kit for baconbrawl	2015-04-01 17:15:56 +11:00
Cheese	ed35d2a992	April Fools update	2015-04-01 16:56:13 +11:00
Shaun Bennett	50c38dc467	April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA	2015-03-31 17:22:50 -04:00
libraryaddict	b84756ef7a	Revert wizard commits	2015-03-27 22:13:50 +13:00
libraryaddict	a772d4cbf2	BlockHunt: Use new setInvisible method in DisguiseChicken	2015-03-27 22:05:16 +13:00
libraryaddict	a27e6fba5c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java	2015-03-27 06:00:14 +13:00
Cheese	821c7f0cb6	Replaced bebe piggles kit with a new kit	2015-03-26 17:43:22 +11:00
Cheese	e3eda38c2c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-26 10:10:11 +11:00
Cheese	6ab03e95ec	more timings for visman	2015-03-26 10:08:41 +11:00
Jonathan Williams	f4061854cd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-25 15:11:17 -07:00
Jonathan Williams	6472194d44	Optimized queries to retrieve and update player information by removing inner join calls on the account. ... Added account id retrieval on login. Added account id caching in redis.	2015-03-25 15:10:59 -07:00
Jonathan Williams	294041b821	Removed Missing Coin application functionality from CustomerSupport server.	2015-03-25 15:05:06 -07:00
Jonathan Williams	09fe3ad6a8	NewsManager : Reduced dynamic string generation every time news changes	2015-03-25 15:04:00 -07:00
Jonathan Williams	589d4b1aae	CoreClientManager accessible to public in MiniDbClientPlugin now.	2015-03-25 15:03:08 -07:00
Jonathan Williams	16c41aba82	Retrofitted BungeeRotator to updating IP information.	2015-03-25 15:02:14 -07:00
Jonathan Williams	6c72bc2c36	Added playerStats caching via redis. ... Fixed MotdManager's forced hardcoded motd.	2015-03-25 15:01:19 -07:00
Jonathan Williams	a8eaf1014f	Updated EnjinTranslator to new backend processing.	2015-03-25 15:00:27 -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
libraryaddict	2d4dcdbd8e	CustomExplosion: Add method to change block explosion size separately	2015-03-25 19:26:25 +13:00
libraryaddict	db5e6ad745	Wizards: Summoned wolves are one-hittable, and one per spell level	2015-03-25 19:25:32 +13:00
libraryaddict	be5086e2a5	Wizards: Give warning before lightning spell hits	2015-03-25 19:22:08 +13:00
libraryaddict	be542b9ce4	Rebalance wizard spell SpeedBoost	2015-03-25 19:21:38 +13:00
libraryaddict	853e6420dd	Add instant-casting to wizards	2015-03-25 19:21:20 +13:00
Cheese	4a25265c7c	Added utility methods to check for players within a sight pyramid	2015-03-25 17:13:22 +11:00
libraryaddict	4988b90d0e	Prevent TNT from being moved in inventories in PerkBomberHG	2015-03-25 16:56:37 +13:00
libraryaddict	63c55a1449	SurvivalGames: Prevent wood dropping, add mushroom soup to base loot and change bowl to soup. Add throwing tnt to loot.	2015-03-25 16:56:05 +13:00
libraryaddict	ad967a092a	Remove TNT from SG placeable and breakable	2015-03-25 16:19:56 +13:00
Cheese	9142227dd4	updates to SG border ... balanced cleave for SG and Champs	2015-03-25 14:16:09 +11: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
Cheese	46dfb532fb	Bridges scoreboard fix ... SG balance DONT QUIT msg improvement	2015-03-23 11:50:09 +11:00
libraryaddict	510b6bcf80	Add optional checks to UtilInv.contains and UtilInv.getItems for cursor and armor items.	2015-03-23 13:13:16 +13:00
libraryaddict	c48dad8eeb	UtilInv.contains() no longer loops through inventory contents, but uses getItems(player) which gets armor, inventory and cursor itemstack.	2015-03-23 13:06:19 +13:00
Cheese	3f2b7444a3	made SG scoreboard display individual player names once there's less then 8	2015-03-22 10:06:11 +11:00
libraryaddict	f99edecba0	Change deathmatch color to red	2015-03-22 00:05:24 +13:00
Cheese	f45bb80ac2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-21 12:23:02 +11:00
Cheese	2bbf035d4c	SG borders now have audio and attack nearby players.	2015-03-21 12:22:47 +11:00
Jonathan Williams	4b81f6cd8b	Fixed Memory leak with lastState in VisibilityData	2015-03-20 09:05:25 -07:00
Jonathan Williams	ef0d8a2813	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-20 08:20:53 -07:00
Cheese	6a68dc6b24	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-20 23:48:30 +11:00
Cheese	28b3828007	slowed hub invis update	2015-03-20 23:48:17 +11:00
libraryaddict	c4edfa8263	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-03-21 01:38:37 +13:00
libraryaddict	ee7ae77311	Use VisibilityManager instead of hidePlayer showPlayer in SG Deathmatch	2015-03-21 01:38:20 +13:00
Jonathan Williams	070cc729de	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-20 05:31:43 -07:00
Cheese	f54ed0ece2	visibility fix	2015-03-20 23:20:56 +11:00
Cheese	0a766cd7bb	increased food and weapons	2015-03-20 22:23:25 +11:00
Jonathan Williams	73e6c555f7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-20 03:16:25 -07:00
Cheese	376824edfc	slowly tnt explosion by 0.5s	2015-03-20 20:46:11 +11:00
Cheese	446951d8af	balance changes for SG	2015-03-20 20:43:42 +11:00
Cheese	57502c226f	changed slasher to barb	2015-03-20 19:39:23 +11:00
Cheese	392a648f8e	fixed cleave hurting self	2015-03-20 18:43:44 +11:00
Cheese	810517b142	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-20 18:22:10 +11:00
Cheese	cdd9400ec2	added slasher kit to SG	2015-03-20 18:21:56 +11:00
libraryaddict	f2ffc57ae2	Fix error, allow snowball and egg to do damage	2015-03-20 20:15:10 +13:00
libraryaddict	baaebd3662	Chiss wants a shorter Assassin Description	2015-03-20 19:43:27 +13:00
libraryaddict	11dcc4af8b	Fix description of Assassin Kit	2015-03-20 19:41:56 +13:00
libraryaddict	83b18129f2	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java	2015-03-20 19:33:27 +13:00
libraryaddict	7bf9c13fd8	Kit Assassin in SG has nametag visiblity set to 8 blocks, normal set to 24	2015-03-20 19:30:08 +13:00
Cheese	6c78bc6f8f	added 10s delay on getting bow in block hunt	2015-03-20 16:51:24 +11:00
Cheese	746fa9e11b	stealer kit for SG	2015-03-20 16:20:55 +11:00
libraryaddict	6c257c1e7d	Store killed players in a hashmap in SG	2015-03-20 18:17:34 +13:00
libraryaddict	19cc6dc12b	Minor bug-fix in the hopes it fixes a major bug for SG	2015-03-20 17:51:03 +13:00
libraryaddict	6e30834565	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-03-20 17:35:42 +13:00
libraryaddict	03bcb120fc	Change border damage from Void to Border Damage	2015-03-20 17:35:27 +13:00
libraryaddict	3e7346618b	Change border creep speed, boats only placeable on water	2015-03-20 17:34:44 +13:00
Cheese	e4475eb7b1	allowed mapleads to stop games ... removed nametag (long range) on wolf pet, and lowered damage from 4 to 3	2015-03-20 12:37:18 +11:00
libraryaddict	7b41649d94	Removed debug logging in SurvivalGames	2015-03-18 22:10:03 +13:00
Jonathan Williams	3e17638bf0	Customer support re-add Dooskee.	2015-03-17 16:22:18 -07:00
Cheese	ee237c9f5b	re-enabled SG in gamefactory	2015-03-17 22:20:40 +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	261b18fcf0	Add GameType options	2015-03-17 23:59:59 +13:00
libraryaddict	52f0941fb9	Add resourcepack options	2015-03-17 23:59:24 +13:00
libraryaddict	733134f709	Update SurvivalGames	2015-03-17 23:53:43 +13:00
libraryaddict	f12d0bf9ef	Allow disabling of game start sounds, and changing of the game PrepareTime.	2015-03-17 23:52:58 +13:00
libraryaddict	340441edbe	SG kit fletcher no longer can pickup fletched arrows	2015-03-17 18:30:48 +13:00
libraryaddict	06ebbbbc73	Remove SG wolf pet on quit	2015-03-17 18:30:17 +13:00
libraryaddict	ec30269a14	Add new loot classes to manage loot	2015-03-17 18:08:47 +13:00
libraryaddict	41469b198a	Change wizards spells to use conditions for potion effects	2015-03-17 18:07:43 +13:00
libraryaddict	03d77abed3	Don't allow people holding gold ingots to deal a lot of damage	2015-03-17 17:49:10 +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	3eba559b01	fixed merge error	2015-03-17 15:02:41 +11: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	e3eb62887d	fixed an eventgame bug	2015-03-17 14:50:56 +11:00
Cheese	44e887ec61	fixed give command to properly assign item data	2015-03-17 12:06:41 +11:00
Cheese	28c683a37a	fixed display for effects	2015-03-16 15:16:17 +11:00
Cheese	b3320d7cbe	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-16 15:01:48 +11:00
Cheese	c941c383e7	fixed hosts not being able to use creative inventroy	2015-03-16 15:01:35 +11:00
Jonathan Williams	2dade32499	Added support for creating Event servers.	2015-03-15 20:50:54 -07:00
Jonathan Williams	8a027872aa	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-15 20:50:14 -07:00
Cheese	efa2b649bd	updated eventserver not expiring	2015-03-16 14:19:43 +11:00
Cheese	a700b61613	added WE permissions to event servers.	2015-03-16 14:10:58 +11: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	d1bc6e4567	Updated EnjinTranslator.	2015-03-15 19:30:37 -07:00
Jonathan Williams	eca5651d83	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-15 19:29:06 -07:00
Jonathan Williams	4d557cb392	Code to improve stat recording, commented out for now.	2015-03-15 19:28:58 -07:00
Jonathan Williams	de780ae2f0	Some geolocation call test code.	2015-03-15 19:28:38 -07:00
Ty Sayers	cec6cf9b2d	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-03-15 13:00:23 -04:00
Ty Sayers	8279f0b17a	Add missing PlayerStatus object to ServerData for cross-server player tracking.	2015-03-15 13:00:15 -04: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	bead4a7626	No longer need to constantly set the durability of items in the sheep game	2015-03-15 13:13:06 +13:00
libraryaddict	db7def2980	Add relative teleports to /teleport command	2015-03-15 12:42:29 +13:00
libraryaddict	f4b6a53adb	Add Wither to ConditionFactory	2015-03-15 12:36:18 +13:00
libraryaddict	ba04c5e834	Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16	2015-03-15 12:35:39 +13:00
libraryaddict	e9fe1fb423	Formatted SpellType, fixed lightning spell description	2015-03-15 12:34:45 +13:00
libraryaddict	18094fea9b	Change UtilPlayer.sendPacket(Packet) to UtilPlayer.sendPacket(Packet...)	2015-03-15 12:32:59 +13:00
libraryaddict	503106892d	Fixed UtilTime for displaying decimals when trimmed	2015-03-15 12:32:42 +13:00
libraryaddict	20a51ee7fc	Change Blood to unstackable items	2015-03-15 12:30:42 +13:00
libraryaddict	e1c284722e	Add method getEntityById to UtilEnt	2015-03-15 12:28:17 +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	c1c284002d	Fixed JREs for Mineplexer and BungeeRotator. ... Added a little more info on debug for BungeeRotator.	2015-03-14 06:21:04 -07:00
Jonathan Williams	d38a28981b	Fixed NPE when type /friend with a space after it.	2015-03-14 06:20:33 -07:00
Jonathan Williams	a002769ac0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-13 22:53:46 -07:00
Ty Sayers	ffedc82785	Commit leftover package that was not committed from previous re-organization.	2015-03-14 01:52:37 -04: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	de9c861df2	Disabled bungee status history.	2015-03-13 18:11:06 -07:00
Jonathan Williams	c157df8fd0	Added debug functionality to BungeeRotator.	2015-03-13 18:10:53 -07:00
Jonathan Williams	d8867711ef	Fix bug with PlayerCount.	2015-03-13 18:10:35 -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	4017ec95c0	Ignore Testing groups in server monitor.	2015-03-13 03:21:50 -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	98960b6ce7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-13 15:40:41 +11:00
Cheese	6762e4b537	Merge branch 'SpecRemoveCreative' of ssh://184.154.0.242:7999/min/Mineplex into SpecRemoveCreative	2015-03-13 11:34:57 +11:00
Cheese	c5d48a82a3	Fixed invisibility bug	2015-03-13 11:34:45 +11:00
Jonathan Williams	e776a9f886	Added new customer support agents to StaffServer	2015-03-12 15:32:35 -07: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
Shaun Bennett	b18ea22df4	Fix spectator gui bug	2015-03-12 15:50:46 -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
Jonathan Williams	ca9ebbb1bd	Updated NoCheatPlus.jar - Removed VehicleExit check because we don't use and we altered the event. ... It spammed consoles when people dismounted from non-vehicles.	2015-03-12 04:09:38 -07:00
Cheese	3ceb0ff678	Converted spec away from CREATIVE	2015-03-12 15:31:40 +11:00
Jonathan Williams	98b14c9c7e	Fixed Clans repository so it uses the pool.	2015-03-11 19:20:42 -07:00
Shaun Bennett	7fd08c6b7b	Merge remote-tracking branch 'origin/master'	2015-03-11 22:18:50 -04:00
Shaun Bennett	f660620e4b	Revert "Pre-Frost changes" ... This reverts commit dbeea5bf69.	2015-03-11 22:18:29 -04:00
Ty Sayers	468f354422	Add fifth slave instance to port 6382.	2015-03-11 22:08:32 -04:00
Ty Sayers	b7a4dd775c	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-03-11 21:52:57 -04:00
Ty Sayers	9788436700	Convert cross-server commands to utilize master-slave redis instances rather than a stand-alone instance. ... Add new slave instance on port 6377.	2015-03-11 21:42:52 -04: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
Cheese	bf901b2280	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-12 12:15:48 +11:00
Cheese	8e77d1fc21	more event server updates	2015-03-12 12:14:49 +11: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
Jonathan Williams	0b2ce48b3e	Fix dead lobbies bug.	2015-03-11 17:27:21 -07:00
Jonathan Williams	a955526adf	Disabled double gems.	2015-03-11 17:24:03 -07:00
Jonathan Williams	1ab43c9f44	Added new support agent to whitelist for customer support server.	2015-03-11 17:23:48 -07:00
Jonathan Williams	4db745c1e5	Added Version and IP logging for Bungees.	2015-03-11 17:23:23 -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
Tim Ziankoski	759db08679	Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex" ... This reverts commit 2e06a272b4, reversing changes made to e443b41e15.	2015-03-09 17:24:01 -04:00
Tim Ziankoski	2e06a272b4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-09 16:43:00 -04:00
Cheese	e443b41e15	removed unfinished code	2015-03-09 22:16:08 +11: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	6614f83579	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-08 20:01:58 -07:00
Ty Sayers	7dbf970df7	Add support for multiple slave connections for load balancing.	2015-03-08 19:17:28 -04:00
Jonathan Williams	fbe6b294cb	Removed redis logging.	2015-03-08 13:51:31 -07:00
Jonathan Williams	72ca1005b3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-08 13:48:52 -07: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
Ty Sayers	2b74e774f1	Redirect ServerCommand PubSub connections to standalone redis instance to distribute load.	2015-03-08 16:46:35 -04:00
libraryaddict	dbeea5bf69	Pre-Frost changes	2015-03-09 05:17:04 +13: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	579ac8171d	Hard-coded UUIDs for Staff Server to prevent UUID lookup Rate limits	2015-03-07 21:48:51 -08:00
Jonathan Williams	bd8c101901	Slowed down interval for pulling servers on bungees.	2015-03-07 21:48:15 -08:00
Jonathan Williams	14da350b16	Removed unnecessary Windows DB call for Pet Factory.	2015-03-07 21:47:48 -08:00
Jonathan Williams	521891f409	Updated BungeeRotator to reflect new API key and abide by new rate limits.	2015-03-07 21:47:02 -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
Tim Ziankoski	ac4b495301	Created internationalization helper class and began i18n process	2015-03-07 20:50:47 -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
Cheese	f2a71b2ea9	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-03-07 11:13:30 +11:00
Cheese	683f86bd89	event server fixes and parser gamtypes	2015-03-07 11:13:17 +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	0336df55aa	Event update	2015-03-06 19:43:17 +11: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	8ddce7cb32	Reduced process wait time per server kill/create ... Added kill bypass for first startup (network reset) Fixed some log messages that weren't being logged.	2015-03-02 13:42:34 -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	c09a23f2bc	Save MapParser's new world spawn location to 0,0 on creation	2015-03-02 03:45:26 +13: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
Jonathan Williams	5816da496d	Adopted StaffServer project to refactors. ... Added default rank package for staff server.	2015-03-01 01:09:22 -08:00
libraryaddict	1fbadfa4f4	Don't compare player world to a plugin fetched world, instead compare the name.	2015-03-01 18:18:53 +13:00
libraryaddict	26e6b66cf5	Fix staff server capitalization changes	2015-03-01 17:41:17 +13: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
libraryaddict	9802c00ec5	Add /spawn and /setspawn commands to MapParser	2015-02-26 21:40:09 +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	145bf98590	Add JIRA configuration for IntellIJ IDEA	2015-02-24 21:18:08 -05:00
Shaun Bennett	cf7e2eed69	Merge with MPS Update	2015-02-24 21:11:16 -05:00
Shaun Bennett	85ee98782e	Revert "Move clans database calls to a seperate thread" ... This reverts commit 61b1e3f48b.	2015-02-24 21:04:57 -05:00
Shaun Bennett	ad5481ef9c	Revert "Remove arcade repository stuff" ... This reverts commit a5f7050e40.	2015-02-24 21:04:19 -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	be591c7d09	Disallow start/stop/kick/setgame while a game is in progress for Donor ranks	2015-02-24 17:22:47 -05:00
Shaun Bennett	857052992d	Increase max player cap to 100 for SnrMod+/Youtube	2015-02-24 14:47:10 -05:00
Shaun Bennett	570374fbb4	Add Wither Assault and Wizards gametypes to legend+ private servers	2015-02-24 14:45:31 -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
CoderTim	0bf6866ad7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-02-23 20:56:34 -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	0a2e11e8bc	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-02-20 23:56:24 -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
libraryaddict	53bb67ec4f	Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits	2015-02-21 20:41:07 +13:00
Jonathan Williams	c02adc0232	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-02-20 23:29:44 -08:00
Jonathan Williams	e6eb938b96	Delayed whitelist additions.	2015-02-20 23:29:19 -08: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
CoderTim	6a368454ec	Clans database refactoring	2015-02-18 21:31:38 -05:00
CoderTim	aebe390c3c	Refactored ClanRole enum	2015-02-18 19:56:29 -05:00
CoderTim	44f453c56e	Updated jOOQ and database tables	2015-02-18 18:51:36 -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
Mini-Chiss	cdbf6c450e	fixed mis-named gameloot chests	2015-02-15 17:35:58 +13:00
Jonathan Williams	17543910b5	Added Chest packages to support server. ... Fixed Punish not loading.	2015-02-14 15:09:42 -08:00
Jonathan Williams	c50e79355f	Added proper logging to BungeeRotator	2015-02-14 13:49:09 -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
Jonathan Williams	beac0b4828	Added try catch in BungeeRotator and ServerMonitor so they don't crash out.	2015-02-14 00:47:03 -08:00
Shaun Bennett	61b1e3f48b	Move clans database calls to a seperate thread	2015-02-13 07:34:09 -05:00
Shaun Bennett	a5f7050e40	Remove arcade repository stuff	2015-02-13 07:33:50 -05: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	e03c65769d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-11 14:16:58 +13:00
Mini-Chiss	cafa59d7e8	adjusted reward rarities	2015-02-11 14:16:08 +13:00
Jonathan Williams	594f0c6045	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-02-10 17:15:06 -08:00
Shaun Bennett	e21e27f07f	Merge remote-tracking branch 'origin/master'	2015-02-10 13:33:59 -05:00
Shaun Bennett	6b3f2114f2	Holy debug code!	2015-02-10 13:27:29 -05:00
Jonathan Williams	80a5acd9f2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-02-10 04:18:05 -08:00
libraryaddict	5a516e4c78	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-11 00:59:45 +13:00
libraryaddict	77350e51de	Using the wrong servername in PlayerTracker	2015-02-11 00:58:21 +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	ff10d0cb06	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-02-10 02:22:57 -08:00
Jonathan Williams	246acc721a	Clans compiles now ;)	2015-02-10 02:22:47 -08: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
Mini-Chiss	01173a2e13	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-10 19:12:56 +13:00
Mini-Chiss	884df48695	disguise command (not yet working fully)	2015-02-10 19:08:54 +13: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	fb563c9274	Fixed customer support whitelist names.	2015-02-09 00:16:20 -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
Shaun Bennett	2f64b5f401	1.8 tablist fix - spigot needs to be updated!	2015-02-05 23:09:20 -05:00
Chiss	417122b7a7	reduced rate that smash crystal spawns	2015-02-06 14:47:34 +11:00
Chiss	09b78fccd7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-06 14:16:26 +11:00
Chiss	14fc6f2145	Chest Update	2015-02-06 14:16:10 +11:00
Shaun Bennett	f8885e4c5c	Merge remote-tracking branch 'origin/master'	2015-02-05 21:36:19 -05:00
Shaun Bennett	d878e3940e	War state, handle time better, ability to have a server timezone (see ClanManager)	2015-02-05 21:36:07 -05:00
libraryaddict	25548046d8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-05 23:42:41 +13:00
libraryaddict	f549402712	Modify wizards to use | for bossbar displays	2015-02-05 23:42:26 +13:00
Chiss	79cde8f5cf	fixed util textbottom for 1.8.2	2015-02-05 21:39:42 +11:00
libraryaddict	64b79424d7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-05 22:34:34 +13:00
libraryaddict	6f8d39b630	Fixed spiders climbing liquids	2015-02-05 22:34:06 +13:00
Jonathan Williams	44bab01e33	Added NoCheatPlus hook for double jump fly hack prevention.	2015-02-04 21:52:14 -08:00
Jonathan Williams	fabf385a57	Added exception handling for group change exceptions so entire dynamic monitor doesn't stop.	2015-02-04 21:41:33 -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	ea30645d42	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-04 18:37:32 +13:00
libraryaddict	55b9435877	Change event used to track player's in bungee	2015-02-04 18:36:44 +13:00
Shaun Bennett	0f23533f41	Fix typos in EnemyData	2015-02-03 23:18:42 -05:00
Shaun Bennett	2060b74343	War death handling, more war logic, other fixes	2015-02-03 19:35:53 -05:00
Shaun Bennett	b0be5b2510	Time code for war, server time command	2015-02-03 16:48:26 -05:00
Shaun Bennett	3b324448b5	Fix errors in war manager	2015-02-03 14:19:22 -05:00
Shaun Bennett	939c6189a7	Merge energy and war with master	2015-02-03 14:16:07 -05:00
Shaun Bennett	bb197ff629	Merge War and Energy	2015-02-03 14:14:52 -05:00
Shaun Bennett	b0a2e655c1	Changes to IntellIJ Files	2015-02-03 14:12:52 -05:00
Shaun Bennett	6cefeb1b74	More work on War	2015-02-03 14:02:45 -05:00
libraryaddict	87f038d21d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-03 22:03:26 +13:00
libraryaddict	e91d76960c	Add a toggleable friends GUI - Chat to Inventory and back	2015-02-03 22:03:07 +13:00
Jonathan Williams	f1930ed7c1	Only record bungee stats for your region...servermonitor	2015-02-01 00:56:18 -08:00
libraryaddict	9118aef60f	Even if death is not the end, refuse players re-entry if they were in the lobby when they quit.	2015-02-01 16:03:29 +13:00
libraryaddict	01fa5b5882	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-02-01 12:19:51 +13:00
libraryaddict	ea24bc1d87	Prevent treasure chests being opened from interfering with portals, ladders, etc.	2015-02-01 12:19:33 +13:00
Jonathan Williams	56fd245032	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-01-31 14:19:45 -08:00
Jonathan Williams	9d3f5f9bc8	Fixed reconnect for bungee connection in StatusHistoryRepository ... Added error catching to ServerMonitor so it doesn't stall program.	2015-01-31 14:19:33 -08:00
libraryaddict	f9cbab6fd8	SuperSmash no longer restores hunger unless you damage a player, not a entity	2015-02-01 09:47:00 +13:00
libraryaddict	4f9f0afa29	BlockToss can no longer pickup blocks next to ladders	2015-02-01 09:40:36 +13:00
libraryaddict	6f369cbcdb	Sort players in spectator menu by name	2015-02-01 08:25:38 +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
Chiss	0c2054ac32	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-01-30 20:49:51 +11:00
Chiss	f03c9d5bab	Fixed damage rate on barrage	2015-01-30 20:48:46 +11: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
Chiss	115f9b58ab	Spider nest :)	2015-01-30 17:02:28 +11:00
Shaun Bennett	9b5b1f635f	Merge remote-tracking branch 'origin/master'	2015-01-30 00:37:16 -05:00
Shaun Bennett	96ce95b72e	treasure changes	2015-01-30 00:37:02 -05:00
Chiss	5b112caa4a	Bone Storm buff	2015-01-30 16:10:03 +11:00
Chiss	c066cb5185	Fixed Bugs	2015-01-30 16:08:22 +11:00
Chiss	3fdf914d63	Smash Wolf Update!	2015-01-30 15:18:50 +11:00
Chiss	76b76cd38c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-01-30 14:42:51 +11:00
Chiss	c8afa151d9	SSM Zombie + Spider Update	2015-01-30 14:42:39 +11: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
Jonathan Williams	908533b232	Added some exception protection in Redis retrieve dedicated servers. ... Removed Statifier project. Improved ServerMonitor: - Added recording of dedicated server stats - Added recording of server group stats - Added recording of bungee stats - Added recording of network stats	2015-01-29 07:05:50 -08:00
libraryaddict	ebc74e5565	Fireball still too fast	2015-01-29 15:01:00 +13:00
Chiss	7f4bcd1210	Smash Update ... new scoreboard (not implemented yet) reward changes	2015-01-29 11:54:59 +11:00
libraryaddict	2dfdde4457	Kit mage will now start with two spells	2015-01-28 03:01:44 +13:00
libraryaddict	1da873ab8f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-01-27 21:09:31 +13:00
libraryaddict	94f79990e4	Kit changes to wizards	2015-01-27 21:09:15 +13:00
Chiss	290e4d69df	map parser update	2015-01-27 13:59:28 +11:00
Chiss	19208de075	mroe map parser ^_^	2015-01-26 11:53:48 +11:00
Chiss	90573903da	added new gametypes for parser	2015-01-26 11:33:47 +11:00
Chiss	b98950b121	map parser visual changes	2015-01-26 11:31:42 +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
libraryaddict	76e6b7530f	Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts	2015-01-26 09:09:46 +13:00
libraryaddict	b4b8b307b0	Rename Wizard Battles to Wizards	2015-01-25 18:50:45 +13:00
libraryaddict	c19f10aff9	Reduce kit mystic mana regen to 10%	2015-01-25 18:33:22 +13:00
libraryaddict	8262eb9f48	Rebalance explosive rune, fix rank bug and books no longer drop	2015-01-25 18:27:21 +13:00
libraryaddict	7682907478	Wizards modifications - Its amazing how things slip past you	2015-01-25 06:18:07 +13:00
libraryaddict	38aac5bab0	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-01-24 23:14:54 +13:00
libraryaddict	3525243f9d	Numerous fixes to Wizards	2015-01-24 23:14:23 +13:00
Jonathan Williams	58a8a32e93	Added cross-server Announcements and Global messages.	2015-01-24 01:44:22 -08:00
Jonathan Williams	d6e8fdd2ed	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-01-23 23:33:39 -08:00
Jonathan Williams	39d1a48bc1	Added cross-server instant punishments. ... [Punish] Banning doesn't kick.	2015-01-23 23:33:24 -08:00
libraryaddict	3ff0592d2d	Mild fix on fireball, fix heal given less cooldown and lower heal spell heals	2015-01-24 13:51:18 +13:00
libraryaddict	31c1be9dd8	Nerf the spell heal	2015-01-23 23:25:03 +13:00
libraryaddict	99c9bfbf33	Left clicking a chest is harmless	2015-01-23 23:18:29 +13:00
libraryaddict	da81d131a7	Don't open wizard spell menu if they right clicked a chest	2015-01-23 23:17:45 +13:00
libraryaddict	b00deb683e	Red overtime	2015-01-23 22:28:07 +13:00
Jonathan Williams	5b39f1642d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-01-23 01:17:38 -08:00
Jonathan Williams	34cd48cfb6	Fix for duplicate check.	2015-01-23 01:17:27 -08:00
libraryaddict	def2018c8b	Remove center blocks of stone wall wizard spell	2015-01-23 22:15:27 +13: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
libraryaddict	c5b444ae6e	Wizards push	2015-01-23 21:52:03 +13: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	8bf64ec55c	Database and code implementation of enemies	2015-01-22 22:17:19 -05:00
Shaun Bennett	882eb46479	Unclaiming land when you run out of energy	2015-01-22 21:32:10 -05:00
Shaun Bennett	2bab4133b0	Fix ugly /gold command	2015-01-22 20:41:05 -05:00
Shaun Bennett	a1f2a3a2a1	Clan Energy	2015-01-22 20:34:44 -05:00
libraryaddict	0b8babb36d	Spectator menu shouldn't be opened when standing on pressure plates should it..	2015-01-23 02:31:38 +13:00
libraryaddict	fa47f33407	*cough* fixes to UtilTime *cough*	2015-01-23 02:31:00 +13:00
libraryaddict	74d7c7df2b	More wizard modifications	2015-01-23 02:30:44 +13:00
libraryaddict	29dc598c00	Update the fireball times to 20min	2015-01-22 01:00:57 +13:00
libraryaddict	94607585a3	Fixed UtilTime being bugged	2015-01-21 19:00:39 +13:00
libraryaddict	eb7e68885b	Hunger now takes longer to decrease	2015-01-21 19:00:26 +13:00
libraryaddict	dd2418232c	Wizards progress	2015-01-21 19:00:07 +13:00
Jonathan Williams	d5ddb9c640	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-01-19 00:50:13 -08:00
Jonathan Williams	d90a46252e	Allow commands to pass when muted.	2015-01-19 00:50:05 -08:00
libraryaddict	52d83587cd	Fix dragon bossbar not being halved	2015-01-18 21:23:50 +13:00
libraryaddict	e11e2090ad	Fix up spells somewhat	2015-01-18 21:23:50 +13:00
libraryaddict	9b574de541	Current wizards	2015-01-18 21:23:49 +13:00
libraryaddict	1ea19ee2e7	Add spell HealingRune, deny weapon crafting, use scoreboard for a simply display	2015-01-18 21:23:49 +13:00
libraryaddict	ea452d8fa5	Wizards progress	2015-01-18 21:23:48 +13:00
libraryaddict	72e61a02df	Changes to wizards	2015-01-18 21:23:48 +13:00
libraryaddict	9b4f1a491e	Add new method to Hologram - Remove hologram on entity death	2015-01-18 21:23:47 +13:00
libraryaddict	611d184024	Cleanup code, add custom explosion, add lance and traprune spell	2015-01-18 21:23:47 +13:00
libraryaddict	a42cfed226	Add a comment on what each of the block hashsets do in UtilBlock to make it easier to use without struggling to remember	2015-01-18 21:23:46 +13:00
libraryaddict	0ad4034f96	The beginnings of a api to calculate shapes; mainly for particle use	2015-01-18 21:23:46 +13:00
libraryaddict	d6b5439eb5	Initilize the static byte HashSet's in UtilBlock not when you try to compare a block, but on class load	2015-01-18 21:23:45 +13:00
libraryaddict	b40393af10	Modify UtilPlayer to get the entity someone is looking at	2015-01-18 21:23:45 +13:00
libraryaddict	d6d01241cb	Progress on wizards	2015-01-18 21:23:44 +13:00
libraryaddict	d232bab051	Wizards Game Progress. Now workable	2015-01-18 21:23:43 +13:00
libraryaddict	0648276720	Current progress on wizards	2015-01-18 21:23:03 +13:00
libraryaddict	34ce818614	Stupid else ifs	2015-01-18 21:23:03 +13:00
libraryaddict	a64e082f2c	Only add a 's' to UtilTime's convertString if the number in the string is not a 1	2015-01-18 21:23:03 +13:00
libraryaddict	5a5946c0d0	Current progress on wizards - Working on scoreboards in a new branch	2015-01-18 21:23:02 +13:00
libraryaddict	a3e0a6b4fd	Wizards Commit	2015-01-18 21:23:02 +13:00
Shaun Bennett	c8be08e5b9	Merge remote-tracking branch 'origin/master'	2015-01-16 15:30:16 -05:00
Shaun Bennett	b395508f0e	54b7f21604c94e9ad2f53956 Flag for Poll DIsplay	2015-01-16 15:30:06 -05:00
Jonathan Williams	78cd5e7070	Changed hub to normal.	2015-01-15 00:39:07 -08: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	b32259d7f1	Fixed length checking with team prefix in GameScoreboard	2015-01-12 12:58:40 -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	9839edeeee	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-01-12 09:55:44 -08:00
Jonathan Williams	e14dfcf313	Fixed Lobby sending with Portal.	2015-01-12 09:55:32 -08:00
libraryaddict	b2fde6c6ca	Do a for(15) loop instead of while true. Don't update scoreboard if its unchanging	2015-01-12 12:22:01 +13:00
libraryaddict	1006d66e0a	Format Scoreboard, fix displaying more than 15 lines	2015-01-12 12:09:45 +13: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	0a99a9aa40	Debug flag now depends on file.	2015-01-10 13:19:33 -08:00
libraryaddict	fa59ed52b9	Fixed arrow count not updating on shoot cancel ... Spectators are now permitted to walk on enemy turf	2015-01-11 09:49:46 +13:00
Jonathan Williams	0d27649e85	Fixed minor bug in ServerMonitor.	2015-01-10 11:53:51 -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
libraryaddict	6343a00b53	Instead of removing the shot arrow, cancel the event instead. Fixes kit Shredder being usable during buildtime	2015-01-10 09:08:35 +13:00
libraryaddict	9863b701d8	Fixed typos in descriptions of SSM kits Wolf and WitherSkele	2015-01-10 08:54:00 +13:00
Chiss	7db748bbe1	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-01-08 13:08:57 +11:00
Chiss	9daee9733f	Fixed UHC height limit ... fixed UHC rejoin health bug	2015-01-08 13:08:15 +11:00
Jonathan Williams	836547f4f6	Added a delay to killing 'dead' servers and a verification run after the initial test before killing.	2015-01-06 10:39:18 -06:00
Jonathan Williams	fc45b80e2b	Added rank pulling on bungee login and the ability to put a cap on network player count. ... Removed log message for converted server group.	2015-01-03 23:37:04 -06: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	a472404316	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-01-03 18:04:08 -06:00
Shaun Bennett	7de1c05d1c	Clans run configuration, build configurations, and minor fixes on hub and arcade build configs. (IntelliJ IDEA)	2015-01-03 15:35:47 -05: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	2a29def670	Bungee rotator only waits 5 minutes before determining a bungee is offline.	2015-01-03 01:53:38 -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	2480361421	LightningOrb now strikes all living entities instead of just players.	2014-12-27 03:25:54 -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
Jonathan Williams	6e93d85da8	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-24 02:49:37 -05:00
Jonathan Williams	008980d9ca	Slowed Server page update speed.	2014-12-24 01:36:33 -05:00
Shaun Bennett	5446557b89	Merge remote-tracking branch 'origin/master'	2014-12-23 17:48:59 -06:00
Shaun Bennett	043f67f78c	Fix for max players not displaying properly (MPS)	2014-12-23 17:48:38 -06:00
libraryaddict	adc5769890	Fix wither not accessible for ranks, fix wither having weird naming in inventories	2014-12-24 04:07:28 +13:00
Shaun Bennett	d83b586a3a	Merge remote-tracking branch 'origin/master'	2014-12-23 08:08:00 -06:00
Shaun Bennett	cff63ca3e3	Phinary needs some sleep!	2014-12-23 08:07:46 -06:00
Jonathan Williams	a1dd1b8753	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-23 08:08:48 -05:00
Jonathan Williams	5dcda626e7	Fixed port stuff for MPS	2014-12-23 08:08:41 -05:00
Chiss	1a3920d04a	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-23 23:45:11 +11:00
Chiss	35bcf28c83	champions builds will now load in MPS, even if the current game isnt champs.	2014-12-23 23:44:59 +11:00
Shaun Bennett	9c1e3aa7aa	Ignore full or dead servers	2014-12-23 06:26:51 -06:00
Shaun Bennett	d40b154902	Merge remote-tracking branch 'origin/master'	2014-12-23 06:20:43 -06:00
Shaun Bennett	c40a5a8eac	Another bugfix	2014-12-23 06:20:36 -06:00
Chiss	78977788a1	fixed bug	2014-12-23 23:18:29 +11:00
Chiss	f4c5922b05	added messages for when server is expired	2014-12-23 23:17:21 +11:00
Chiss	78d94320a8	fixed reciptient of message	2014-12-23 22:55:07 +11:00
Shaun Bennett	ea6214b2ad	Merge remote-tracking branch 'origin/master'	2014-12-23 05:49:08 -06:00
Shaun Bennett	582ed34d21	Fix for staff hosted	2014-12-23 05:48:45 -06: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	50993d19f3	Added Legend for Enjin	2014-12-23 06:07:14 -05: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
Shaun Bennett	d8311d860e	Ignore private servers	2014-12-23 04:21:37 -06:00
Shaun Bennett	21d255fcd1	Merge remote-tracking branch 'origin/master'	2014-12-23 04:15:55 -06:00
Shaun Bennett	c41b5b0cfb	private server gui, i think?	2014-12-23 04:15:33 -06:00
Chiss	6d2bd84b5b	disabled always joinable motd for minestrike	2014-12-23 20:39:49 +11: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	521b61c624	disabled free evolutions	2014-12-23 19:42:13 +11:00
Chiss	6b5b072ae8	missing file	2014-12-23 19:36:23 +11:00
Chiss	7496f64d58	benefit	2014-12-23 19:36:10 +11:00
Chiss	a15256da88	update	2014-12-23 19:04: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
Chiss	07d82b8206	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-23 18:39:22 +11:00
Chiss	39745913ac	re-enabled roggue	2014-12-23 18:39:05 +11: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
Shaun Bennett	eb0f23318f	Fix my fix for scoreboard - mine broke when new players joined	2014-12-23 00:06:30 -06:00
Shaun Bennett	4b4ebd0e36	Change admin item to sparkling melon	2014-12-23 00:06:04 -06:00
Shaun Bennett	8f9794a5f7	Merge remote-tracking branch 'origin/master' ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java	2014-12-22 23:56:18 -06:00
Shaun Bennett	706b3e25ef	Fix broken player count when changing max players	2014-12-22 23:54:51 -06:00
Chiss	64d37d1886	minor snd changes	2014-12-23 16:50:31 +11: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
Shaun Bennett	1957db25d9	Add player head button	2014-12-22 23:20:20 -06:00
Shaun Bennett	befc2cff7c	messing with jedis subpub	2014-12-22 22:49:28 -06:00
Chiss	e8953b0c96	fixed merge errors	2014-12-23 15:14:03 +11:00
Chiss	f961fd0233	Merge remote-tracking branch 'remotes/origin/searchanddestroy' ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2014-12-23 15:09:58 +11:00
Chiss	0659f497c0	frost lord update	2014-12-23 15:00:32 +11:00
Chiss	19a7e6d666	time update	2014-12-23 13:01:44 +11:00
Shaun Bennett	8ed7f34ab6	Sorted game pages	2014-12-22 19:20:08 -06: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	71cf8e8fd2	undid champs stuff :(	2014-12-23 11:22:41 +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
Shaun Bennett	0f5c33fe52	derp derp chissderp	2014-12-22 17:41:12 -06:00
Shaun Bennett	b51367f33b	Add missing jooq classes	2014-12-22 17:40:04 -06:00
Shaun Bennett	31b040c654	Merge remote-tracking branch 'origin/master'	2014-12-22 17:37:10 -06:00
Shaun Bennett	1396c3395a	Add kill button, rename ban to remove, add some messages for actions, add remove admin	2014-12-22 17:37:02 -06:00
Chiss	224d1bbf63	blizzard particle redo ... hub text	2014-12-23 10:36:48 +11:00
Shaun Bennett	9a9936bc8c	Allow animated motd to be enabled or disabled through database	2014-12-22 16:39:34 -06:00
Shaun Bennett	3efc80ec58	Update jooq database classes	2014-12-22 16:11:59 -06: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	fa0a9ac859	fixed exploit on skylands	2014-12-22 21:08:44 +11:00
Chiss	ec8e1f0546	more MPS stuff ... fixed bridges exploit	2014-12-22 16:31:13 +11:00
Chiss	2472ca95ec	MPS updates	2014-12-22 13:19:45 +11: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	0e7dec919d	minor updates	2014-12-22 10:51:19 +11:00
Chiss	71f7b4c963	legend join messages	2014-12-22 10:40:06 +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
Chiss	9321abdaf5	Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy	2014-12-19 13:59:31 +11:00
Chiss	184c6cb4ba	added func to change attackreason for combatmanager	2014-12-19 13:59:18 +11:00
Jonathan Williams	52cc0862d7	Memory leak fix for CUSTOM TAG	2014-12-18 18:29:33 -05:00
libraryaddict	93314711e7	Modified snd	2014-12-18 17:56:21 +13: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	437c1aeabe	MPS rank todo	2014-12-18 13:06:57 +11: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	604243dfa3	UI improvements - icon changes, whitelist toggle, notify messages	2014-12-17 19:42:11 -06:00
Shaun Bennett	2677d2e557	Fancy icons for 1.8!	2014-12-17 19:15:31 -06:00
Shaun Bennett	a63c48e338	Refactoring private server menu	2014-12-17 18:45:15 -06:00
Shaun Bennett	d19431a47f	Rename Clicked to onClick	2014-12-17 18:40:44 -06:00
Shaun Bennett	1260e875fd	Add clans to intellij. Update button	2014-12-17 18:38:35 -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	6eb3efa0b6	More changes	2014-12-16 20:37:14 -06:00
Shaun Bennett	62a621270e	More work on private server gui. Still need to do a bunch of refactoring	2014-12-16 13:43:01 -06:00
Shaun Bennett	83218c9a73	Pushing unfinished code for laptop	2014-12-16 11:42:06 -06:00
libraryaddict	5b1f4f16fb	Modify giveGems for new give gems	2014-12-16 21:58:17 +13: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
Jonathan Williams	0cb5939794	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-15 21:30:20 -05:00
Jonathan Williams	6941c1c827	Added a few more items for BuildingShop in Clans.	2014-12-15 21:29:50 -05:00
Chiss	1907014db4	disguise wither update	2014-12-16 13:28:59 +11:00
libraryaddict	7e6b6bd1b2	Add evolve effect	2014-12-16 15:23:31 +13:00
libraryaddict	6d3a1116b9	Changes to SnD	2014-12-16 15:14:10 +13:00
libraryaddict	913f827ced	Changes to SnD	2014-12-16 15:14:09 +13:00
libraryaddict	da6b4b6a79	Current work for SnD	2014-12-16 15:14:09 +13:00
libraryaddict	0026127647	More work done on SnD	2014-12-16 15:14:08 +13:00
libraryaddict	f5d9d8dcf0	Modify scoreboard to use teams to support duplicate lines and up to 32 in length	2014-12-16 15:14:08 +13:00
libraryaddict	715862b365	Commit current changes	2014-12-16 15:14:07 +13:00
libraryaddict	6d7a71d043	Modifications for SnD test	2014-12-16 15:14:07 +13: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	ee363f55a6	re-enabled gems for CC	2014-12-15 15:50:25 +11: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	230c6ede13	Disabled gem reward in ChristmasChaos	2014-12-14 22:14:41 -05:00
Chiss	19dfafe9ed	disabled gems	2014-12-15 13:58:36 +11:00
Chiss	909c0d9be7	christmas no longer rewards gems	2014-12-15 13:56:48 +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	0111db5610	Added safe check for server monitor so it doesn't go off the rails during a network reboot.	2014-12-14 05:54:49 -05: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
Jonathan Williams	718e02047e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-13 20:22:48 -05:00
Jonathan Williams	28dc4059a4	Don't reset Lobby index else lower lobby counts can crash due to spam connects.	2014-12-13 20:22:37 -05:00
Jonathan Williams	4e0c91c26d	Adjusted limit on CC game.	2014-12-13 20:22:01 -05:00
Jonathan Williams	80c17c789c	Updated BungeeCord to newest custom version.	2014-12-13 20:21:34 -05:00
Chiss	0198120c70	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-13 12:39:20 +11:00
Chiss	78a34b1517	hopefully fixed a bug where pumpking king despawned. ... removed 11 disc from loot	2014-12-13 11:55:12 +11:00
Jonathan Williams	2f98d95737	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-12 06:47:58 -05:00
Chiss	fb8b00200c	deep snow no longer slowz	2014-12-12 21:57:43 +11:00
Chiss	5d1a8af347	fixed arctic armor killing players in hub	2014-12-12 21:53:39 +11:00
Jonathan Williams	514445557b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-12 05:32:13 -05:00
Chiss	dfd17b1793	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-12 21:29:46 +11:00
Chiss	3f24325c3c	removed +50% player limit for CC	2014-12-12 21:23:01 +11:00
Jonathan Williams	52fad77297	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-12 05:21:45 -05:00
Jonathan Williams	771c7cba0a	Changed playercount back to current +1	2014-12-12 05:21:23 -05:00
Shaun Bennett	e19c76575b	Merge pull request #7 from feature/animated-motd to master ... * commit '56bc8dc2325d00cbd95247bcc1d270ba0ed703a1': Trying to do some hacky things!	2014-12-12 04:19:38 -06:00
Shaun Bennett	56bc8dc232	Trying to do some hacky things!	2014-12-12 04:18:47 -06:00
Shaun Bennett	14c6c1ca4b	Merge pull request #6 from feature/animated-motd to master ... * commit 'b65ca5f7dd8e07d2d65e59d08a7d907d29b172d6': Update bungee cord, comment out debug stuff Fix icon animation + some more tweaks Some adjustments Motd stuff for xmas update pushing this for my laptop. not final code!	2014-12-12 02:54:30 -06:00
Shaun Bennett	b65ca5f7dd	Update bungee cord, comment out debug stuff	2014-12-12 02:53:56 -06:00
Chiss	4fd6ed80c4	final xmas Updates ... xmas hub	2014-12-12 19:44:04 +11:00
Shaun Bennett	7b42bd661f	Fix icon animation + some more tweaks	2014-12-12 01:13:02 -06:00
Shaun Bennett	ac02201262	Some adjustments	2014-12-12 00:48:08 -06:00
Shaun Bennett	30a7eea628	Motd stuff for xmas update	2014-12-12 00:28:29 -06: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	adafc95d3f	boss weaker	2014-12-12 10:26:32 +11:00
Chiss	2be4d7d6d2	XMAS UPDATE	2014-12-12 10:03:25 +11:00
Shaun Bennett	93dc3c9090	pushing this for my laptop. not final code!	2014-12-11 09:17:19 -06:00
Chiss	3af8a90d3b	near final xmas push :D	2014-12-11 15:23:01 +11:00
libraryaddict	3a8ab0afb0	Uncomment SleighHorse	2014-12-11 15:24:10 +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
libraryaddict	ee8d699bd1	Minor text cleanup in the sleighhorse code because you guys seem to like that	2014-12-11 07:25:40 +13:00
libraryaddict	2a13255af3	Turn christmas chaos game horses into reindeer	2014-12-11 07:23:47 +13:00
Chiss	068a0901f9	xmas updatre	2014-12-11 00:16:15 +11:00
Jonathan Williams	91954d43df	Added DataWatcher Vector support.	2014-12-10 03:42:31 -08: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	11e09b202c	Fixed PullWhileLeashed bug and ghost bug.	2014-12-10 03:34:05 -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	6de278bb4f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-09 20:24:07 +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
Jonathan Williams	625d517058	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-08 00:55:43 -08:00
Jonathan Williams	342c44affc	Fixed a bunch of clans bugs	2014-12-08 00:55:20 -08:00
Chiss	50358c0c30	removed EULA breach in bridges private blocks	2014-12-08 18:23:47 +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
Jonathan Williams	60a46d5adf	Replaced Dwarf Toss with Block Toss in Clans.	2014-12-06 04:23:26 -08:00
Shaun Bennett	4a7b6bd33f	Blame chips	2014-12-06 01:10:08 -06:00
Shaun Bennett	7402eb2f91	Merge remote-tracking branch 'origin/master'	2014-12-06 01:00:40 -06:00
Shaun Bennett	b99da44873	Disable mail and notifications	2014-12-06 01:00:02 -06:00
Shaun Bennett	1276e0c0d5	Chat Slow Command	2014-12-05 21:33:31 -06:00
libraryaddict	048aa40590	Remove comments and add comments	2014-12-06 03:25:53 +13:00
libraryaddict	307d280534	Read merge message	2014-12-06 02:22:52 +13: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	54d8fe21fb	Notifications and stuffs?	2014-12-04 22:48:54 -06:00
Shaun Bennett	03bd2ed2c1	Make JsonMessage a little easier to use, might be worth it to increase functionality later as more complicated things are added to json text	2014-12-04 17:48:06 -06: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	fbcc774383	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-04 05:05:43 -08: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
Chiss	38639fb58f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java	2014-12-04 13:34:08 +11:00
Chiss	6cc4ec034b	Champs Updates ... UHC Y Limit in middle	2014-12-04 13:33:31 +11:00
Jonathan Williams	abaf9f4693	Refactored IRelation method names ... Added support for negative amounts in Support server. Clans in core testing state.	2014-12-03 13:06:50 -08:00
Jonathan Williams	1fd1e5cc34	Removed unused gem booster code.	2014-12-02 12:50:53 -08:00
Jonathan Williams	b0f13cc7f0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-01 23:53:42 -08:00
Jonathan Williams	63506c9ebc	Changed message in CUST-1 ... Fixed how QueuedCommands are handled, don't rerun website api call if it succeeded.	2014-12-01 23:53:35 -08:00
Chiss	a8deee5292	fixed a spelling error	2014-12-02 18:04:48 +11:00
Chiss	340f5d87a4	removed debug	2014-12-02 12:30:59 +11:00
Chiss	e63ef8a607	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-02 11:50:03 +11:00
Chiss	5695e845ef	resistence no longer effects hold position.	2014-12-02 11:49:39 +11:00
Jonathan Williams	7a3b4771ee	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-01 16:14:15 -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
Chiss	6319bffd42	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-02 09:50:47 +11:00
Chiss	185b182061	fixed teleports removing you from the game	2014-12-02 09:50:30 +11:00
Jonathan Williams	78a0aa7c96	Added checks to restart UHC servers stuck in restarting mode.	2014-12-01 03:34:37 -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	3584c0d8af	Added Key/Chest support for EnjinListener	2014-12-01 02:03:46 -08:00
Jonathan Williams	9d39cb922c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-01 01:22:51 -08:00
Jonathan Williams	433483dcca	Fixed error in GameLootManager	2014-12-01 01:22:43 -08:00
Chiss	39faf35409	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-01 19:33:55 +11:00
Chiss	cee48f1978	made it so you can use fireworks without aiming against block in blockhunt ... removed fire from magma blast private blocks are no longer private if owner is dead	2014-12-01 19:33:36 +11: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
libraryaddict	9ddd0bd9cc	Player now sees theirselves disguised as the same block they are disguised as.	2014-11-30 16:39:27 +13:00
libraryaddict	effc026913	Lets just pretend this was the original commit..	2014-11-30 15:56:50 +13:00
libraryaddict	ec26b8b642	Max item amount is 10 for non-bow classes. So sayth Chiss	2014-11-30 15:55:57 +13:00
libraryaddict	0813f0a914	Instead of having a internal entityId. Use mojang's entityid's but add one everytime you want it. Also allow fetching of the next entityid to be used	2014-11-30 15:41:57 +13:00
libraryaddict	e654b23a50	We don't need that debug output	2014-11-30 15:06:50 +13:00
libraryaddict	5157c2bf37	Disable hiders from seeing their own block	2014-11-30 15:06:18 +13:00
libraryaddict	54fe312251	Untested fix I'm 99% sure will fix hide and seek players being blinded	2014-11-30 13:47:07 +13:00
libraryaddict	f8869a84ba	Don't send the player himself the block change..	2014-11-30 13:22:01 +13:00
libraryaddict	751731a1ad	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-30 12:14:51 +13:00
libraryaddict	00d3e66ac4	Commit my current work on SnD kits	2014-11-30 12:12:02 +13:00
libraryaddict	8afb803d5d	Modify the bow kits a little	2014-11-30 10:26:12 +13:00
Jonathan Williams	5a281a56e9	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-29 03:17:53 -08: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
libraryaddict	e57bd8b473	Finish making the bow kit tree	2014-11-29 16:39:09 +13:00
libraryaddict	e3b0843b2c	Modify Barrage perk to support setting levels to indicate arrows	2014-11-29 16:38:54 +13:00
libraryaddict	6439fc93c2	Use metadata instead of storing the entity and location	2014-11-29 14:50:38 +13:00
Chiss	350a5cfcea	disabled brute skill	2014-11-29 11:21:44 +11: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	b0e62bfedf	Cleanup imports and rename fields to your _ and non _	2014-11-29 10:51:34 +13:00
libraryaddict	24bc581f35	Add the kits I have	2014-11-29 10:36:34 +13:00
libraryaddict	e587fca8f1	Move KitBow to its own package	2014-11-29 07:53:33 +13:00
libraryaddict	5544bbb440	Add KitEvolve inventory	2014-11-29 07:22:18 +13:00
libraryaddict	e6fac6de39	Small typo in UpgradeKit stuff	2014-11-29 07:22:02 +13: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	515176b63f	Clans to buildable state.	2014-11-27 22:34:20 -08: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	d731b6ee69	Registering of KitManager	2014-11-27 09:47:43 +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
Shaun Bennett	cded2c7d8f	Update Polls to use new MiniDbClientPlugin	2014-11-26 12:07:06 -06: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
Shaun Bennett	7c9226d6de	Fix mail to work with recent changes	2014-11-26 11:55:28 -06:00
libraryaddict	1bb4d902c6	Start on a kit manager	2014-11-27 06:44:46 +13:00
Shaun Bennett	c73a9f3bd5	Merge remote-tracking branch 'origin/master'	2014-11-26 11:39:13 -06: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	9350aeb89a	Use holograms in game	2014-11-27 03:18:52 +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	52411a188f	Fixed entityId not using UtilEnt	2014-11-27 01:08:43 +13:00
libraryaddict	b68c95c6a2	Finish up adding bombs and turn this into a working game. Add demo kit Bow	2014-11-27 01:08:42 +13:00
libraryaddict	c76ad50136	Allow removal of packet handler	2014-11-27 01:08:42 +13:00
libraryaddict	3ae27ccc55	Store PacketHandler so that games can use it	2014-11-27 01:08:41 +13:00
libraryaddict	5bf185e588	Register Search and Destroy in GameFactory	2014-11-27 01:08:40 +13:00
libraryaddict	60fd6b01cc	Add Search and Destroy code	2014-11-27 01:08:40 +13:00
libraryaddict	aa0659828a	Register game SearchAndDestroy	2014-11-27 01:08:39 +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
Chiss	95e428eb4f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java	2014-11-26 12:34:47 +11:00
Chiss	731b0d89dd	Merge	2014-11-26 12:33:39 +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	d9c06e0fd3	Shauny!	2014-11-25 13:26:30 -08: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
Jonathan Williams	1198426d8d	Little more work on Clans.	2014-11-23 05:08:33 -08:00
Jonathan Williams	cb43bc04d3	Added /lobby	2014-11-23 03:35:16 -08:00
Chiss	2871446f74	reduced max amount of blocks from explosions	2014-11-23 15:01:04 +11:00
Chiss	0c5ec503be	reduced fireworks in dragons	2014-11-23 15:00:05 +11:00
Chiss	089fdf8a64	sparklers no longer attract once they're in water or below 0	2014-11-23 14:55:06 +11:00
Chiss	d4a127b8ad	reduced fps lag in runner	2014-11-23 14:47:28 +11:00
Chiss	50b2870705	changed locked ability icon to diamond	2014-11-23 14:13:00 +11:00
Jonathan Williams	dc5584d51b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-22 17:52:30 -08: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
Chiss	0e4b21e6b1	disabled charge skills being usable in hub	2014-11-23 11:46:47 +11:00
Chiss	f0c87e439a	fixed nametag color in paintball	2014-11-23 11:16:01 +11:00
Chiss	b3a9410e54	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-23 10:36:11 +11:00
Chiss	01f0e5fab4	fixed static laser not doing less dmg when not charged	2014-11-23 10:35:56 +11:00
Jonathan Williams	695ed95b5d	Fixed StaffServer commands for inventory.	2014-11-21 18:34:28 -08:00
Jonathan Williams	390c0dfff3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-21 18:30:38 -08:00
Jonathan Williams	6efa416d81	Fixed glitching dom items in Hub due to portal throw.	2014-11-21 18:30:26 -08:00
Chiss	19d3bba461	fixed fence glitch in dom	2014-11-22 13:20:34 +11:00
Chiss	8a4de9bbdc	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-22 10:29:12 +11:00
Chiss	6dfcdce027	increased illusion cooldown ... cleaned axethrow	2014-11-22 10:29:00 +11: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	3dfd7e6036	Fixed Champions bug with losing builds.	2014-11-21 14:39:51 -08:00
Jonathan Williams	64a1426463	Added custom build load check on login.	2014-11-20 23:52:56 -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	0d78433bd2	updated mapparser ... buffed withers a little	2014-11-21 10:36:41 +11: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
Shaun Bennett	a73ee4e306	Structure for Mail system, not finished yet.	2014-11-20 14:41:25 -06:00
Jonathan Williams	77b47c9e13	Fixed UI achievement skill stuff.	2014-11-20 08:50:25 -08:00
Chiss	972911fe05	set achievement skills	2014-11-20 18:01:46 +11:00
Jonathan Williams	d1a4080cbd	Added GUI support for achievement skills.	2014-11-19 22:47:10 -08: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	1a6b80b08e	More work on clans.. ... Finished ClansDataAccessLayer Finished ClansAdmin Finished ClansDisplay	2014-11-19 22:24:36 -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
Chiss	4961b55986	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-18 16:43:53 +11:00
Chiss	f5022ecf16	Fixed dupe glitch (all games) ... Some champions skill fixes created GameSpectatorManager to handle spec stuffz	2014-11-18 16:43:39 +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
Chiss	2384b91b06	game timer > advertisement	2014-11-16 14:45:18 +11:00
Chiss	900c31f479	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-16 14:41:11 +11:00
Chiss	cd890e6c6c	disabled spec menu in minestrike - fixes shop bug.	2014-11-16 14:40:50 +11:00
Jonathan Williams	2e58342032	Removed MS from beta.	2014-11-15 19:27:37 -08:00
Jonathan Williams	24b59e5a9d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 16:26:39 -08:00
Chiss	4c3610c3ac	fixed DMT silence	2014-11-16 10:46:26 +11:00
Jonathan Williams	99ff386ac1	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 14:32:40 -08:00
Chiss	454deb03db	fixed SG crash bug	2014-11-16 09:31:03 +11:00
Jonathan Williams	ad6f41e1c6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 03:42:57 -08:00
Chiss	057594205e	Only closing CREATIVE Inv for non-ops.	2014-11-15 22:40:56 +11:00
Chiss	ca58f11174	specs should be able to view stats now	2014-11-15 22:32:00 +11:00
Jonathan Williams	81b5317376	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 03:31:01 -08:00
Chiss	fb70b76d29	FINGERS CROSSED	2014-11-15 22:29:53 +11:00
Jonathan Williams	857ff29461	Removed buggy player disguises. ... Removed datavalues from wither disguise.	2014-11-15 03:21:48 -08:00
Jonathan Williams	531b242cce	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 03:08:35 -08:00
Shaun Bennett	d16896e493	Merge remote-tracking branch 'origin/master'	2014-11-15 05:04:57 -06:00
Shaun Bennett	1ca23390cc	Fix my derp	2014-11-15 05:04:48 -06: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
Chiss	41b6296788	Wither no longer shoots in pregame lobby	2014-11-15 20:16:18 +11: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	1ee16d284d	Updated StaffServer packages to reflect enjin shop.	2014-11-13 19:14:43 -08:00
Chiss	8ab0116a27	initial push of Wither Assault	2014-11-14 14:14:31 +11:00
Jonathan Williams	62fbeeda20	Added Wither disguise.	2014-11-13 19:14:14 -08:00
Shaun Bennett	223bc2d0c0	Remove some debug messages that we no longer need	2014-11-13 19:34:55 -06:00
Shaun Bennett	6038c72e86	Add cleaner page for when there is only 1 team	2014-11-13 19:33:39 -06:00
Shaun Bennett	ea8b8dca15	Disable spectator menu for castle siege and uhc until I work out a better way to show that many players	2014-11-13 19:18:28 -06: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
Shaun Bennett	8b73b89a17	Merging spectator gui with main branch	2014-11-13 16:03:14 -06:00
Chiss	112f76a29a	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-13 18:10:10 +11:00
Chiss	9eaacd20ab	fixed slime healing ... fixed sheep quest brute not dropping sheep updated punish page	2014-11-13 18:09:54 +11:00
CoderTim	09ca2234c4	Fixed survival games death match bug: https://trello.com/c/jNGSUUGI	2014-11-13 01:49:14 -05:00
CoderTim	7667aa25a8	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-13 00:26:53 -05: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
CoderTim	d363637015	Achievement bug fixes	2014-11-12 20:56:57 -05: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
Chiss	debf8ebcba	fixed chat not being unsilenced when someone picks word	2014-11-11 18:52:00 +11:00
Shaun Bennett	c0f2f8a88c	Remove useless comment/import	2014-11-11 01:47:03 -06:00
Chiss	c37026e4df	SSM Dom changes	2014-11-11 18:36:32 +11: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	cf25d17c66	Update craftbukkit.jar with command event	2014-11-10 23:53:08 -06: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
Chiss	91f92dc7e1	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-11 12:25:52 +11:00
Chiss	a1eff92bbb	fixed achievement kit for sneaky not being accessible	2014-11-11 12:25:36 +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	d2301337d2	fixed non-charged block toss not having any velocity.	2014-11-10 19:28:36 +11: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	d6ade5a15b	ensured that exp cannot be given multiple times for a game	2014-11-09 14:43:06 +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
Chiss	b65d2f491e	exp gives less for losing	2014-11-09 10:33:50 +11:00
Chiss	2a04ed6eda	losing games no longer gives exp	2014-11-09 10:30:26 +11:00
Chiss	ad933400b9	Sheep Quest update ... lowered exp on loss removed Participation exp	2014-11-09 10:06:04 +11:00
Jonathan Williams	403165edf4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-08 14:32:48 -08:00
Jonathan Williams	2781bb3000	Removed stacking buffers.	2014-11-08 14:32:37 -08:00
Jonathan Williams	7fb679e7f5	Changed lobbyBalancer to send one player to each lobby that wasn't full.	2014-11-08 14:32:24 -08:00
Chiss	7e26def6a1	centralised SneakyAssassins module cleanup	2014-11-08 18:40:23 +11:00
Chiss	5ce38c3030	removed final from npcManager	2014-11-08 18:37:18 +11:00
Chiss	b6904f2ae1	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-08 18:36:18 +11:00
Chiss	c0ec9f92fc	nulled reference too, just to be safe :D	2014-11-08 18:36:05 +11:00
Chiss	2b0befdc13	fixed listener leak in SneakyAssassins	2014-11-08 18:35:34 +11: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
Jonathan Williams	c310ba734b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 16:09:05 -08:00
Chiss	fc2bba7eeb	reverted idlemanager stuff for dmt(had already made talking in chat count as action)	2014-11-08 11:08:13 +11:00
Jonathan Williams	0a874d0ee3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 16:04:14 -08:00
Chiss	8c74022996	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-08 11:04:06 +11:00
Jonathan Williams	48c627db74	UHC tweaks and message changes.	2014-11-07 16:04:06 -08:00
Chiss	601c1912f5	may have fixed sheep teams not working.	2014-11-08 11:03:53 +11:00
CoderTim	80226a20fa	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 18:55:20 -05:00
CoderTim	4c98d833e0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 18:33:46 -05:00
Chiss	e286bec777	added a little msg for people in UHC, informing that it will start soon	2014-11-08 10:30:32 +11:00
CoderTim	5b1a185a5f	Fixed Bad Hider achievement	2014-11-07 18:28:28 -05:00
CoderTim	ae35e82e22	Disabled AFK kick in Draw My Thing	2014-11-07 18:28:06 -05:00
CoderTim	96f54c2949	Made DBPool class uninstantiatable	2014-11-07 18:27:20 -05:00
Chiss	75c07588a5	UHC wont start for 2 minutes after creation	2014-11-08 10:22:23 +11: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
Chiss	5da0c53997	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-08 08:56:52 +11:00
Chiss	e773d44564	limited max exp so UHC doesnt give you a billion exp.	2014-11-08 08:56:30 +11:00
Jonathan Williams	4ac70281d4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 13:54:22 -08: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	bd730b1e5a	Fixed OITQ not giving wins. ... Added silence during word selection in DMT	2014-11-08 08:46:26 +11:00
Chiss	c64e4e3b5f	fixed winners/losers for death tag.	2014-11-07 23:35:43 +11:00
Chiss	908a8506a7	fixed broken OITQ kit	2014-11-07 23:21:30 +11:00
Chiss	519e63a1c1	re-unlocked kits for single game ultra chaps.	2014-11-07 23:10:33 +11: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	5c6f12db20	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 02:35:48 -08:00
Jonathan Williams	33696d1e28	Fixed null resourcePack problem.	2014-11-07 02:35:38 -08:00
Chiss	9c80103d6e	completely disabled gamehost manager (double safe)	2014-11-07 21:32:44 +11:00
Jonathan Williams	2c098e531a	Added error catching for arcade configuration.	2014-11-07 02:14:34 -08: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	cd4d2c16a8	Fixed fortitude healing too much	2014-11-07 14:07:22 +11:00
Chiss	a67842b504	returned hub to normal ... removed flaming pumpkins from arcade	2014-11-07 12:54:38 +11:00
Chiss	b7ce12165e	game host stuff	2014-11-07 12:14:33 +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	ecad60eee3	Added PlayerTracker to Mineplexer ... Changed how max players is displayed in Mineplexer Added a cut-off of 900 players for each bungee in BungeeRotator, minimum of two records.	2014-11-05 14:40:40 -08:00
Jonathan Williams	1a09c14642	Reverted database connection pooling because it caused severe login delays.	2014-11-05 14:39:22 -08:00
Chiss	f3b9ad8adf	Chatting will reset Idle Timer in games (for DMT) ... Minor kit changes	2014-11-05 14:46:49 +11: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	a2f7a84120	Fix Hub Rule Book	2014-11-03 18:46:49 -06: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
Chiss	ab62708883	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-03 16:34:20 +11:00
Chiss	20fe69b596	added skills to lore of custom builds ... fixed skeleton not having enough arrows	2014-11-02 11:09:20 +11: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	da88d68513	UHC does not record team stats	2014-11-01 15:42:52 +11:00
Jonathan Williams	f1966be6a2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-31 17:29:57 -07:00
Chiss	7f642673bc	fixed deathbomber achievement	2014-11-01 11:25:08 +11:00
Jonathan Williams	1f26aee006	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-31 17:12:27 -07:00
Chiss	0095a03df7	returned bridges to normal	2014-11-01 11:11:35 +11:00
Jonathan Williams	2aced64191	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-31 17:03:15 -07:00
Jonathan Williams	45da22b0bf	Fixed bug with parkour enchantment checks.	2014-10-31 17:03:06 -07:00
Chiss	de28906aa5	restored 10 min timer for bridges	2014-11-01 09:18:44 +11:00
Chiss	d0a8a86698	disabled tnt water damage before bridges drop	2014-11-01 09:18:25 +11:00
Chiss	58d6cf199b	fixed foodformassesstat kind of? doesnt update db still	2014-11-01 08:59:57 +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	bf6e788f36	1 more fix for sheepy	2014-10-31 16:47:20 +11:00
Chiss	c4264dcea1	fixed sheep skill trigger names	2014-10-31 15:58:11 +11:00
Chiss	50a2bcda66	BACK FROM THE DEAD	2014-10-31 15:40:40 +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	22daf54f35	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-30 18:20:29 -04:00
CoderTim	cc8912b27e	Added NPC info messages to NpcManager	2014-10-30 18:20:21 -04:00
Jonathan Williams	bd19369ddb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-29 17:16:00 -07:00
Jonathan Williams	2f563f8277	BungeeRotator project.	2014-10-29 17:15:32 -07:00
CoderTim	ee0aa1375d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-29 19:14:57 -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
CoderTim	08f0eb9252	Achievement bug fixes	2014-10-29 01:40:34 -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	cd5e4234b7	Fixed a couple more achievement bugs ... Track damage mods in combat log	2014-10-27 19:00:34 -04: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
Jonathan Williams	0ee9619d3e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-25 14:35:12 -07:00
Jonathan Williams	ead014f65e	Increased server startup time to 30 seconds.	2014-10-25 14:34:38 -07:00