5838 Commits

Author	SHA1	Message	Date
Sarah	b56813deef	Improving /e commands (/e kick, /e area, etc)	2015-09-12 04:33:10 +02:00
Ty Sayers	0bafae6485	Fix bug where certain damage events threw excessive NPEs based on spawn protection checks.	2015-09-11 17:09:50 -05:00
Ty Sayers	9be0ecc598	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java Additionally: Disable Endermen and Horses from spawning on the server. Fix bug where players could shoot others from within spawn and throw cobwebs from inside spawn. Fix bug where players could use the Travel Hub while combat tagged. Fix bug where Water flowed into Spawn areas. Fix bug where players could abuse BlockToss to pick up water blocks and throw them inside restricted liquid areas. Fix bug where Fissure created cracked StoneBricks which could be exploited for base raiding. Re-organize some Spawn/Safe Zone related logic into a more intuitive location (Spawn class) and add more descriptive documentation to event handlers in Spawn.	2015-09-11 17:01:04 -05:00
Ty Sayers	b4248a3d5b	Fix bug where Assassins could teleport outside of the Borders (causing their death) with several skills. Fix bug where crafting denials for certain items were not properly communicated to the user. Clean up use-cases for cancelling fishing to prevent players from not being able to use their class abilities. Fix bug where pigs could be struck my lightning using class abilities, spawning in pig zombies that could be farmed for gold.	2015-09-11 16:04:52 -05:00
Cheese	5a79c51506	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-09-10 13:57:48 +10:00
Cheese	a4cc70c3f0	new small youtuber rank	2015-09-10 13:17:11 +10:00
Ty Sayers	15b51fe575	Fix bug where Fissure skill travelled through doorways as well as increase cooldown. Fix bug where Cobwebs could be thrown inside spawn safe zones and increase cooldown. Modify StaticLazer skill's range, damage, cooldown, and damage radius for balance purposes. Remove the ability to craft TNT Minecarts and Jukeboxes. Disable fishing ability in Clans. Add the requirement that players must crouch while clicking on furnaces to be able to smelt. Fix bug where Axes weren't considered a weapon in the context of player murders.	2015-09-07 20:39:34 -05:00
fooify	5824ec6df0	lots of changes to monster maze, check trello for list	2015-09-07 07:08:00 -07:00
Morten	6ea9a15e6d	Added a bunch of games	2015-09-07 11:46:08 +02:00
Sarah	4240026024	Adding Areas and a few more commands like /e kick and /e tempgadget to the event game.	2015-09-06 18:55:00 +02:00
libraryaddict	6474f5a9e9	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-09-06 16:23:18 +12:00
Sarah	5712af8ddc	Adding Redstone function signs for events.	2015-09-05 20:38:51 +02:00
fooify	c648d7c186	stuff, things...things, stuff (Monster Maze)	2015-09-05 09:30:51 -07:00
fooify	9e3f87b71e	more edits to MM ... - displaying more information - permanent safezones around the map - spawn now does not deteriorate, is permanent	2015-09-05 06:41:10 -07:00
Jonathan Williams	4bb100b6be	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-09-05 01:53:45 -07:00
Jonathan Williams	4ad95b54cf	Updated ServerMonitor status reporting for network.	2015-09-05 01:53:37 -07:00
Jonathan Williams	2536d8a437	Fixed out of range stats causing no stats to load. ... Issue fix to db for out of range stat on login.	2015-09-05 01:40:56 -07:00
Cheese	0ac808ba43	stacker pref is now only for pvp stacking.	2015-09-05 10:30:11 +10:00
Cheese	fc5ccd4a5e	fixed 'self scoring' in Soccer ... removed silverfish on wither pet despawn	2015-09-05 10:04:54 +10:00
Cheese	106a7dab2e	removed ability for entities to change blcoks in hub	2015-09-05 09:48:06 +10:00
Mysticate	271b86dabd	Fixed spectators slowing evolution times.	2015-09-04 11:45:42 -04:00
libraryaddict	21d9f5767e	CustomTagFix support changing and removing of names.	2015-09-04 19:23:33 +12:00
AlexTheCoder	b28419caab	Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-09-04 02:59:28 -04:00
AlexTheCoder	f05cdd4915	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-09-04 02:57:47 -04:00
Cheese	03537e4650	fixed a spacing issue	2015-09-04 12:18:02 +10:00
Cheese	0ec3a8dc10	added radar for ctf and dom	2015-09-04 12:09:26 +10:00
Jonathan Williams	921292a5c6	Added timings capture and server log copy on server kill inside server monitor.	2015-09-03 09:38:26 -07:00
Jonathan Williams	890c9d59e1	Fixed loading window bug. ... Added default rank for CoreClient in case of bugged login.	2015-09-03 09:38:02 -07:00
Mysticate	0c58de3c19	Glitches. Fixed the things.	2015-09-01 02:35:06 -04:00
Mysticate	b4ce33a916	Fixed things. ... • Added a cancelled check to No Ability • Removed tokens on quit. • Checked if players are alive before giving them places.	2015-09-01 01:59:36 -04:00
AlexTheCoder	9dc90b0e13	Added CTF to Champions stat group	2015-09-01 01:26:35 -04:00
AlexTheCoder	bff9c99e2c	Added system to mount flags on carrier's head for easier identification and disabling of abilities as per Chiss' request	2015-08-31 21:48:25 -04:00
AlexTheCoder	8a94602aef	Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text	2015-08-31 16:03:27 -04:00
AlexTheCoder	fe4586852c	Made rank unlock lore colored based on rank required for item (QA Requested)	2015-08-31 15:59:53 -04:00
AlexTheCoder	cbb0d4521c	Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.	2015-08-31 15:49:31 -04:00
AlexTheCoder	5322e9d018	Marked the Bunny Morph to reflect its no longer available status	2015-08-31 15:48:25 -04:00
AlexTheCoder	24fed013ae	Fixed previous ownership not being transferred	2015-08-31 15:39:04 -04:00
AlexTheCoder	32a257fa55	Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts	2015-08-31 15:11:57 -04:00
AlexTheCoder	b63843930f	Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui	2015-08-31 15:08:42 -04:00
Sarah	503b68da2f	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates	2015-08-31 11:32:47 +02:00
Sarah	58ae09ebd4	saving Project for pulling.	2015-08-31 11:32:18 +02:00
AlexTheCoder	e93db405d0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-08-31 04:48:43 -04:00
AlexTheCoder	129464a845	Added CTF to MPS menus	2015-08-31 04:42:36 -04:00
AlexTheCoder	788ec97d38	Added CTF wins to achievements for champions	2015-08-31 04:39:07 -04:00
Jonathan Williams	c61f9ce3c8	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-31 00:53:23 -07:00
Jonathan Williams	740899c09e	Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird ... Fixes Lobby crashes.	2015-08-31 00:53:07 -07:00
AlexTheCoder	cbf8b575c6	Changed data for certain types of spawning	2015-08-31 03:28:22 -04:00
AlexTheCoder	39a79eb818	Fixed a nullpointer	2015-08-31 03:05:43 -04:00
AlexTheCoder	474f1bd0b8	Made CTF follow Chiss' specifications and also added more advanced features	2015-08-31 03:04:18 -04:00
Shaun Bennett	7c53feec71	Add axes and bows to murder detection	2015-08-30 17:59:46 -07:00
Mysticate	becfbe1f13	Fixed possible game breaking bug :S	2015-08-30 20:09:47 -04:00
Shaun Bennett	fa0fd062d4	Allow Media to join server, Supply drop work	2015-08-30 17:08:56 -07:00
Ty Sayers	eba98e7e7c	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-30 17:05:57 -07:00
Ty Sayers	6bb4e69236	Fix bug where players could shift-click items into shop page and lose it forever. Fixed bug where players couldn't place blocks against Anvils/Enchantment Tables while crouched. Fixed bug where clans could enemy other clans that had vastly fewer members than them. Fix bug where CustomGear items broke when a player entered Creative gamemode. Fixed bug where CustomGear suffix attributes did not properly format names. Fixed bug where the Frosted weapon attribute did not properly apply it's slowness effects to enemies.	2015-08-30 17:05:45 -07:00
Mini-Chiss	d79794c6d3	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-30 15:47:57 -07:00
Mini-Chiss	bb66d47e8e	meow	2015-08-30 15:47:49 -07:00
Mysticate	33d78a5efd	Fixed eating spider eye. Yay!	2015-08-30 18:39:07 -04:00
AlexTheCoder	6fefcbd953	Kit Changes/Fixes: ... - Fixed Kit Mobs not opening guis in Champions games - Fixed Abilities not working in CTF - Added new event when a player attempts to choose a kit - Cancelled changing kit while holding a flag	2015-08-30 17:13:08 -04:00
Ty Sayers	b0efe35531	Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub.	2015-08-30 13:14:01 -07:00
Shaun Bennett	1b6833ae16	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-30 12:41:22 -07:00
Shaun Bennett	5d77202370	Add SrMod to blacklist, prevent armor from breaking when hitting people with it, stop firing block toss event if you cant use block toss	2015-08-30 12:41:15 -07:00
Ty Sayers	ab73cc2fbe	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-30 12:28:55 -07:00
Ty Sayers	54f910845e	Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop.	2015-08-30 12:28:44 -07:00
Shaun Bennett	908d11ead5	Disable staff from joining the full server, Fix clans login manager, fix undead camp not spawning, fix clans admin command for all players, enable server for mapdev+, add TNT, generator, and class shop back to pvp shop, fix land claiming query	2015-08-30 12:00:58 -07:00
AlexTheCoder	149d37caad	Forgot to commit with actual game	2015-08-30 04:01:01 -04:00
AlexTheCoder	eca69a8ae2	Made new branch up to date and including previous branch's code	2015-08-30 03:58:58 -04:00
Jonathan Williams	47331658ac	Merge remote-tracking branch 'remotes/origin/Myst_EVO'	2015-08-30 00:14:53 -07:00
Jonathan Williams	b59511ece4	Added duplicate login kick for network.	2015-08-30 00:12:54 -07:00
Ty Sayers	7047bbf8f6	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-29 19:06:20 -07:00
Ty Sayers	c1b356e42f	Fix asynchronous race conditions in ServerData.	2015-08-29 19:05:14 -07:00
libraryaddict	4b7a4a4d5c	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 18:58:43 -07:00
libraryaddict	cbab8861d8	SNakes!!	2015-08-29 18:58:33 -07:00
Mini-Chiss	bcdd72558d	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 18:58:21 -07:00
Mini-Chiss	368ed955ea	qwrwr	2015-08-29 18:58:12 -07:00
Ty Sayers	36a22caa1e	Fix bug where lastOnline stat for clans wasn't properly loading on server transfer.	2015-08-29 18:23:04 -07:00
Ty Sayers	4e045f438d	Prevent fire from burning blocks in spawn areas.	2015-08-29 18:12:43 -07:00
Ty Sayers	606e9e8318	Fix bug where serverId column was referenced.	2015-08-29 18:08:18 -07:00
Ty Sayers	f5b9aca708	Fix bug where serverId column was being referenced in table after it's removal.	2015-08-29 18:04:50 -07:00
Ty Sayers	da3810e5a3	Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers.	2015-08-29 17:57:18 -07:00
Ty Sayers	138a4cf638	Fix bug where transferring a clan to destination server would not load properly server-side.	2015-08-29 17:43:12 -07:00
Ty Sayers	f47c1b5c14	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-29 17:33:08 -07:00
Ty Sayers	b0c657b5c0	Fix bug where generator location per-clan wasn't being reset properly on server transfer.	2015-08-29 17:33:01 -07:00
Ty Sayers	5df7a5e0c9	Fix bugs related to multiple server UI and clan server transferring.	2015-08-29 17:31:54 -07:00
Shaun Bennett	4dbd2d3586	Reduce login kick time	2015-08-29 17:28:47 -07:00
Shaun Bennett	caf82ad606	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-29 17:18:24 -07:00
Shaun Bennett	c27fdf023c	Fix login manager and stats manager	2015-08-29 17:18:14 -07:00
libraryaddict	f4ade8e9f7	Snnkes	2015-08-29 17:05:47 -07:00
Shaun Bennett	820bc1af44	Setup new module for intellij, fix field ore	2015-08-29 16:56:26 -07:00
Mini-Chiss	50b6bfbe1a	snake	2015-08-29 16:54:23 -07:00
Mini-Chiss	a76610e21e	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta ... Conflicts: Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeCreature.java	2015-08-29 16:47:47 -07:00
Mini-Chiss	6bd29394b3	snake	2015-08-29 16:46:55 -07:00
libraryaddict	e2e0756b9f	Snakes anyone?	2015-08-29 16:43:40 -07:00
Mini-Chiss	05ecfb8ff0	snake workin!	2015-08-29 16:33:35 -07:00
Mini-Chiss	110222e5f3	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 16:02:21 -07:00
Mini-Chiss	64b9cd201c	snake crap	2015-08-29 16:02:14 -07:00
Ty Sayers	227a077dba	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java	2015-08-29 15:53:42 -07:00
Ty Sayers	197309b914	Commit left-over changes to merge and pull.	2015-08-29 15:44:29 -07:00
Shaun Bennett	5db4a55dda	Enable clans login manager	2015-08-29 15:41:37 -07:00
Shaun Bennett	16b317a877	Forgot to remove debug code	2015-08-29 15:17:03 -07:00
Shaun Bennett	9ad39c1fe7	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-29 15:09:08 -07:00
Shaun Bennett	4aee4f8fd7	Fix generators	2015-08-29 15:09:02 -07:00
libraryaddict	6ae801314c	Fix spawning	2015-08-29 15:07:51 -07:00
libraryaddict	9a1469f6b0	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 15:03:32 -07:00
libraryaddict	5030ae7d57	For Chiss, may the code never break.	2015-08-29 15:03:22 -07:00
Jonathan Williams	c2c23c22e5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-29 14:55:04 -07:00
Jonathan Williams	4e32bad8dd	Fixed bug with stats pulling as int. ... Fixed bug with Poll recording selections wrong.	2015-08-29 14:54:57 -07:00
Ty Sayers	088068be80	Add 'Clans' to the ignored server groups for ServerMonitor to prevent interference with live Clans servers.	2015-08-29 14:51:17 -07:00
Ty Sayers	aad5942242	Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.	2015-08-29 14:46:18 -07:00
Shaun Bennett	5b534313f5	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-29 14:37:43 -07:00
Shaun Bennett	8f1da698d2	TNT generator storage in mysql (needs testing still)	2015-08-29 14:37:35 -07:00
Mini-Chiss	eb6a0c9e38	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 14:27:54 -07:00
Mini-Chiss	efd435396f	snake	2015-08-29 14:27:40 -07:00
Shaun Bennett	16d807db2e	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-29 14:01:45 -07:00
Shaun Bennett	62cf58bd55	Fix a bug where claiming a new land would display that land as neutral	2015-08-29 13:56:26 -07:00
libraryaddict	f0f9a4c674	Push it like a pushy pushy lady.	2015-08-29 13:46:09 -07:00
Mini-Chiss	b7b81ecaaa	snake	2015-08-29 13:38:40 -07:00
Shaun Bennett	fae27df496	Add ClansLoginManager, TNT Generators (Still needs persistence)	2015-08-29 13:35:31 -07:00
Mysticate	046fa4f8b6	Fixed possible NPE	2015-08-29 14:30:22 -06:00
Mysticate	736d88c82f	All achievements fixed. ^_^	2015-08-29 14:13:15 -06:00
Mini-Chiss	d2bc4b8cb4	SNAAAKE	2015-08-29 13:13:04 -07:00
libraryaddict	5d28509474	Snakes tail final location instead of rel movement	2015-08-29 12:38:19 -07:00
libraryaddict	bd2fda17b0	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 12:07:23 -07:00
libraryaddict	7cd98c82e9	Refactor and move BossAbiliy	2015-08-29 12:06:57 -07:00
libraryaddict	e7f861a6c2	Push golem changes, snakes code and rename bossability thingy	2015-08-29 12:04:53 -07:00
Mysticate	97c7980bbc	Fixed evolving into walls.	2015-08-29 10:54:04 -06:00
Mysticate	55a7ea0439	Fixed kit bug.	2015-08-29 10:44:11 -06:00
Mini-Chiss	9ebabed1a8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-29 00:14:26 -07:00
Mini-Chiss	6a28845cb0	Merge branch 'Myst_EVO'	2015-08-29 00:14:15 -07:00
Mysticate	12d9888a1f	Fixed wins..	2015-08-29 00:58:53 -06:00
Jonathan Williams	f8729cbd66	Fixed Gadget.	2015-08-28 23:47:27 -07:00
Mini-Chiss	d35b5940fc	fixed achievements	2015-08-28 23:30:21 -07:00
Mini-Chiss	5ae01f95a8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-28 23:27:35 -07:00
Mini-Chiss	181afaa2d6	Merge branch 'Myst_EVO'	2015-08-28 23:25:51 -07:00
Mysticate	b71bcfab4b	Fixed achievements. Merge ASAP	2015-08-29 00:19:39 -06:00
Jonathan Williams	d4d0c4bed6	Updated Motd.	2015-08-28 23:17:14 -07:00
Jonathan Williams	c98a85c2ba	Added local storage of login time. ... Hooked in onlineTime bonus feature to real values.	2015-08-28 22:09:42 -07:00
Jonathan Williams	ba4da32939	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-28 21:44:07 -07:00
Jonathan Williams	e47662f855	Added LoginTime setting as RedisTime for use in calculating time on server. ... Optimized redis util for time calls to calculate time different and only pull redis time once.	2015-08-28 21:44:00 -07:00
Mini-Chiss	829c1d2ae8	Merge branch 'Myst_EVO'	2015-08-28 21:30:10 -07:00
Mysticate	c40fecb03f	Removed warning from private servers	2015-08-28 22:06:13 -06:00
Mini-Chiss	041c5ab53c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-28 21:00:34 -07:00
Mini-Chiss	3f1c4d24b9	Merge branch 'Myst_EVO'	2015-08-28 21:00:00 -07:00
Jonathan Williams	ad4ba010b7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-28 20:59:08 -07:00
Jonathan Williams	6f0309622c	Removed AccountCache. ... Converted that to PlayerCache and store account id in there.	2015-08-28 20:58:58 -07:00
Mysticate	bb09720450	removed previous commit jesus	2015-08-28 21:56:35 -06:00
Mini-Chiss	d68f1fa547	Merge branch 'Myst_EVO'	2015-08-28 20:50:27 -07:00
Mysticate	6628f5a1ae	Added a checker for a no kit issue	2015-08-28 21:49:57 -06:00
Mini-Chiss	19b2ff5b58	fixed scoreboard	2015-08-28 20:48:32 -07:00
Mini-Chiss	11cc4a6cea	removed msg	2015-08-28 20:45:59 -07:00
Mini-Chiss	fda866a33f	Merge branch 'Myst_EVO'	2015-08-28 20:35:59 -07:00
Mysticate	4466c10441	FIXED	2015-08-28 21:35:31 -06:00
Mini-Chiss	4ac6b22e53	Merge branch 'Myst_EVO'	2015-08-28 20:31:56 -07:00
Mini-Chiss	88ca205474	fixes	2015-08-28 20:31:29 -07:00
Mysticate	815add4c59	FIXED THE THIGNS	2015-08-28 21:28:39 -06:00
Mini-Chiss	5777309d18	Merge branch 'Myst_EVO'	2015-08-28 20:07:22 -07:00
Mini-Chiss	8238a199d5	gem stuff	2015-08-28 20:06:39 -07:00
Mysticate	cc60371c1f	Fixed perk cancelling on death	2015-08-28 21:04:35 -06:00
Mini-Chiss	d879bc68ab	Merge branch 'Myst_EVO' ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java	2015-08-28 19:59:48 -07:00
Mini-Chiss	b5b8bef39e	evo fixes	2015-08-28 19:58:51 -07:00
Mysticate	d6c8e51104	Things ^_^	2015-08-28 20:57:47 -06:00
Mysticate	ebd3fbe6d5	Merge remote-tracking branch 'origin/master' into Myst_EVO	2015-08-28 20:19:27 -06:00
Mini-Chiss	abf1f23087	double gem	2015-08-28 19:16:49 -07:00
Mysticate	56aa235e56	Fixed kit messages	2015-08-28 19:25:52 -06:00
Shaun Bennett	676817601a	Prevent players from logging into the wrong clans server	2015-08-28 17:31:09 -07:00
Mini-Chiss	c8c569281b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-28 16:18:49 -07:00
Mini-Chiss	5562345c05	Merge branch 'SarahsAwesomeBugFixes'	2015-08-28 16:02:40 -07:00
Sarah	3be6483ed3	editing /game set for test servers.	2015-08-29 01:01:05 +02:00
Sarah	0f37829b54	changing Hotbar text to money.	2015-08-29 00:56:24 +02:00
Mysticate	2d770a8dd1	More final tweaks.	2015-08-28 16:36:35 -06:00
Sarah	ccc9645c47	adding hotbar text.	2015-08-29 00:24:44 +02:00
Mysticate	513662e6e3	Fixed the block open flag.	2015-08-28 15:46:38 -06:00
Mysticate	f21ca35638	Final bug changes.	2015-08-28 15:44:41 -06:00
Ty Sayers	35c79804ac	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-28 14:17:22 -07:00
Ty Sayers	825dd66283	Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones.	2015-08-28 14:17:11 -07:00
Jonathan Williams	e9b33668bc	Added donorsOnline to MinecraftServer snapshot ... Refactored Rank class to use lowercase methods.	2015-08-28 13:22:04 -07:00
Shaun Bennett	c51a449df3	Enable caching for clans, update craftbukkit jar	2015-08-28 13:10:30 -07:00
Shaun Bennett	6f39c072a4	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-28 12:57:13 -07:00
Shaun Bennett	7761ca7e6f	Remove debug messages	2015-08-28 12:56:43 -07:00
Ty Sayers	5cdf31d0e6	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-28 12:52:12 -07:00
Ty Sayers	b98cde8b80	Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed.	2015-08-28 12:52:02 -07:00
Shaun Bennett	cd145324d8	Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit	2015-08-28 12:00:23 -07:00
libraryaddict	249ecdd381	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-28 11:42:53 -07:00
libraryaddict	1f5cd624a4	Fix up iron golem, add slam attack	2015-08-28 11:42:33 -07:00
Sarah	2a236684ac	Finalizing prototype of Type wars.	2015-08-28 14:47:49 +02:00
Mysticate	571d992dbe	Fixed a few bugs.	2015-08-27 20:47:55 -06:00
Ty Sayers	6a330a66d9	Fix bug with Building shop materials not properly being purchased in bulk. Modify the notification message for combat tagged players in safezones to display on the middle of the screen instead of chat.	2015-08-27 15:46:57 -07:00
Ty Sayers	2e4c27cb11	Merge pull request #45 in MIN/mineplex from clans_custom_gear to clans-beta ... * commit '4ddc82f8204e322373b54c50308dc6bdb29f59b3': Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class	2015-08-27 16:56:41 -05:00
Ty Sayers	ff13f51151	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-27 14:55:33 -07:00
Ty Sayers	4ddc82f820	Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class	2015-08-27 14:54:56 -07:00
Shaun Bennett	4f2d861b21	Fix chat bug, enable TablistFix for clans	2015-08-27 14:53:52 -07:00
Ty Sayers	783f526b76	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-27 14:42:41 -07:00
Ty Sayers	4dcd54a9b0	Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans.	2015-08-27 14:42:07 -07:00
libraryaddict	379ee9271a	Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta ... * commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b': Iron Wizard, fixed iron golem custom name Push golem block shot as per request	2015-08-27 16:34:46 -05:00
Shaun Bennett	e86bca99fd	Clans Chat	2015-08-27 14:33:50 -07:00
libraryaddict	9d3f125c9e	Iron Wizard, fixed iron golem custom name	2015-08-27 14:18:10 -07:00
Shaun Bennett	b0ee2bb669	Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items	2015-08-27 13:57:57 -07:00
libraryaddict	102fcd8e73	Push golem block shot as per request	2015-08-27 11:10:17 -07:00
Shaun Bennett	adfc451e9f	You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift	2015-08-27 09:33:44 -07:00
Mysticate	f2f6afb6ca	Fixes :D	2015-08-26 20:10:58 -06:00
Shaun Bennett	a5400b0fef	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-26 18:35:20 -07:00
Ty Sayers	c20d2c9516	Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands.	2015-08-26 17:37:31 -07:00
Shaun Bennett	669de4c91d	Change EntitySpawnEvent to CreatureSpawnEvent	2015-08-26 16:44:39 -07:00
Shaun Bennett	e4c48e5f3f	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta	2015-08-26 15:01:44 -07:00
Shaun Bennett	e85682d68f	Use proper item names for recipes, don't allow repairing items more than two times	2015-08-26 14:56:28 -07:00
Ty Sayers	62ffdc1ef1	Left-over commit from last update to add new /region-reset command.	2015-08-26 14:54:33 -07:00
Ty Sayers	3b999d2660	Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields.	2015-08-26 14:54:15 -07:00
Shaun Bennett	0dd79419eb	Update schematic files	2015-08-26 13:39:13 -07:00
Shaun Bennett	e6c4227a4f	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta	2015-08-26 13:30:02 -07:00
Ty Sayers	fc5f57803e	Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map.	2015-08-26 13:29:22 -07:00
Ty Sayers	c3013063de	Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans.	2015-08-26 13:09:10 -07:00
Shaun Bennett	14f5cb4704	Allow breaking/placing blocks when in creative	2015-08-26 13:09:01 -07:00
Mysticate	a351a8f1ed	Minor improvements.	2015-08-26 13:47:01 -06:00
Shaun Bennett	7a66a8dad9	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-26 12:26:35 -07:00
Shaun Bennett	b13c9fe227	Field updates, War updates, bug fixes	2015-08-26 12:26:27 -07:00
Ty Sayers	52911b9534	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-26 12:24:02 -07:00
Ty Sayers	9a45d1116a	Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones.	2015-08-26 12:22:36 -07:00
Mysticate	cfdb0dfa4f	Added kits + achievements. Hurrah!	2015-08-26 13:19:17 -06:00
Mysticate	988382375f	Started adding kits	2015-08-25 23:36:18 -06:00
Sarah	15aca5dca9	Making the mob spawning prototype. still have to figure out how to move them properly.	2015-08-26 00:59:28 +02:00
fooify	e9bc0d3a5f	capitalize h	2015-08-25 08:23:22 -07:00
fooify	64ca6ecce0	Merge remote-tracking branch 'origin/master' into foo	2015-08-25 08:20:37 -07:00
fooify	1952ee7824	fix some strings mentioning "admin" in MPS	2015-08-25 08:19:09 -07:00
Shaun Bennett	062328313e	Fix errors	2015-08-24 22:24:26 -05:00
Jonathan Williams	61c80fd31d	Fixed issue with player login sessions.	2015-08-24 20:21:14 -07:00
Shaun Bennett	bf1f62057c	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta ... Conflicts: Plugins/.idea/misc.xml Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java	2015-08-24 22:15:08 -05:00
Shaun Bennett	6841cbac69	Clans bug fixes + shop updates	2015-08-24 22:03:26 -05:00
Jonathan Williams	b64a75cbf3	Added maintenance message.	2015-08-24 18:35:11 -07:00
Ty Sayers	69afefd66f	Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.	2015-08-24 20:55:29 -04:00
Mysticate	7b42f2155d	Tweaks. :D	2015-08-24 20:40:34 -04:00
fooify	2e016de9e5	Fixed ignore command, now works	2015-08-24 14:07:21 -07:00
fooify	549435224f	changes to monster maze!	2015-08-24 09:58:07 -07:00
libraryaddict	ba41118da7	Load boss battles properly	2015-08-25 01:58:57 +12:00
Mini-Chiss	6249dadf91	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-23 16:27:47 -07:00
Jonathan Williams	6d3c965f14	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-23 16:26:02 -07:00
Jonathan Williams	74fd729975	Updated BungeeCord to latest version.	2015-08-23 15:48:03 -07:00
Jonathan Williams	fec8398608	UPdated ChestConverter to convert stats.	2015-08-23 15:47:03 -07:00
Jonathan Williams	34a5d9c722	Updated MotdManager to update both repositories.	2015-08-23 15:46:23 -07:00
Jonathan Williams	1e7f2f01a7	Fixed problem where UUID api was preventing client loading from db.	2015-08-23 15:38:43 -07:00
libraryaddict	8798244351	Bosses stuff	2015-08-24 08:34:29 +12:00
Mini-Chiss	d454d73ccb	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-23 11:32:48 -07:00
Mini-Chiss	69ff514bf8	changed perms on write	2015-08-23 11:31:32 -07:00
Ty Sayers	a9f5197c64	Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Database/src/mineplex/database/Account.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java	2015-08-22 15:18:51 -04:00
Ty Sayers	6c9a99fa1b	Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning.	2015-08-22 15:06:05 -04:00
Morten	f9fecebeec	Minor update ;)	2015-08-22 11:01:37 +02:00
Mysticate	cbaaee60d9	Removed mob spectating method from evolving.	2015-08-21 13:00:08 -04:00
libraryaddict	cdc92f8b2f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-22 00:38:55 +12:00
libraryaddict	7841b17d03	Add PacketPlayOutCamera for locking view to entity	2015-08-22 00:38:37 +12:00
libraryaddict	bad339cf04	Tweak dead bodies more	2015-08-21 20:52:57 +12:00
libraryaddict	c41328d726	Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games	2015-08-21 20:40:09 +12:00
libraryaddict	39ede2064a	Bosses game progress	2015-08-21 16:12:26 +12:00
Mini-Chiss	63107b0c26	missing file	2015-08-20 20:39:20 +02:00
Mini-Chiss	15c873392a	updated give to allow naming of items.	2015-08-20 20:38:07 +02:00
Mysticate	86ad6a09de	Used armor stands for evolving.	2015-08-20 13:04:22 -04:00
xGamingDudex	633cbdabe2	player.isOnGround() is controlled by packets from the player, meaning ... players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground. Outlines two opposite corners of the entities bounding box, scann all blocks inside, check if any of them are solid and return respectively.	2015-08-20 15:42:39 +02:00
Mini-Chiss	f97da1bdba	Merge branch 'SarahsAwesomeBugFixes'	2015-08-19 16:33:37 +02:00
Sarah	6e926b431c	Fixing snowballs and eggs in Solo Skywars.	2015-08-19 16:00:36 +02:00
Jonathan Williams	bbe5b79c7e	Disabled AntiHack create table. ... Fixed NPE with ServerManager	2015-08-19 04:11:34 -05:00
Mini-Chiss	3d7c81a3b4	fixed game tips	2015-08-19 08:15:22 +02:00
Mysticate	64990ed356	Fixed parse distance.	2015-08-18 21:37:52 -04:00
fooify	859a7e07d5	added the optional functionality ... to include air blocks in the util method getInBoundingBox()	2015-08-18 16:46:20 -07:00
fooify	15eba5b491	added more y velocity	2015-08-18 12:22:34 -07:00
Mysticate	53395a7700	Made player immovable whilst evolving.	2015-08-18 13:07:46 -04:00
Mini-Chiss	14bf8faf3a	disabled big sale	2015-08-18 09:49:53 +02:00
fooify	d489b31738	merge	2015-08-17 16:27:28 -07:00
fooify	a47022d242	Merge remote-tracking branch 'origin/master' into monster-maze	2015-08-17 14:54:19 -07:00
fooify	9343bc0048	trying to merge	2015-08-17 14:53:59 -07:00
Mysticate	75a4b3d568	Changes to make evolving easier ... • Speed 1 on kill • Evolve chargeup decreases 1.5 seconds per kill.	2015-08-17 10:36:28 -04:00
Mini-Chiss	b7854e6cab	added big larry to chests	2015-08-17 13:05:41 +02:00
Mini-Chiss	9eed03237b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-17 12:39:06 +02:00
Mini-Chiss	58e517a4d7	fixed null args more	2015-08-17 12:38:41 +02:00
Shaun Bennett	8ab8388344	Merge remote-tracking branch 'origin/master'	2015-08-17 05:05:36 -05:00
Shaun Bennett	5c71522b2d	Return the first UUID instead of last (AccountRepository)	2015-08-17 05:05:25 -05:00
Mini-Chiss	0a23f91592	fixed two little bogs	2015-08-17 11:53:50 +02:00
libraryaddict	1e14d29999	Clans: Migrate bosses to combat core, fix map to rotate its cursor, finished golem?	2015-08-17 21:04:26 +12:00
Shaun Bennett	dc8bec340e	Rename Quick game menu for consistency	2015-08-17 03:18:35 -05:00
Mini-Chiss	7a7543886f	fixed a ton of commands NPEing on no args	2015-08-17 09:04:39 +02:00
Mysticate	993ed0a92d	Fixed a possible NPE	2015-08-16 22:38:59 -04:00
Mini-Chiss	8cc5ff042c	fixed block hunt gem exploits	2015-08-16 09:33:15 +02:00
Mini-Chiss	91ce9cfba7	fixed a crash with fireworks	2015-08-16 08:39:03 +02:00
Mini-Chiss	8584e0355a	final fix!	2015-08-15 12:32:03 +02:00
Mini-Chiss	ba6806935d	fixed better	2015-08-15 12:31:19 +02:00
Mini-Chiss	6ac586790d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-15 12:27:30 +02:00
Mini-Chiss	25f93bac2e	fixed logic on setgame	2015-08-15 12:27:11 +02:00
Shaun Bennett	555908a3c1	Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo	2015-08-15 02:03:46 -05:00
Sarah	27da9b64b6	Merge branch 'KitPreferences' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes	2015-08-15 07:40:40 +02:00
Sarah	96dc86a481	Fixing map rotation.	2015-08-15 07:34:04 +02:00
Mysticate	2659dd4e39	Fixed minor bugs. Head now follows mob altitude.	2015-08-14 23:17:56 -04:00
Shaun Bennett	fda052ea90	Add treasure chest stats	2015-08-14 21:34:37 -05:00
Shaun Bennett	e89961380b	Merge remote-tracking branch 'origin/master'	2015-08-14 21:14:41 -05:00
Shaun Bennett	1eaa6446af	Fix double hologram and hopefully NPE	2015-08-14 21:14:34 -05:00
Shaun Bennett	c520bd7921	Add recharge to carl spins so that they don't get triggered twice	2015-08-14 20:43:58 -05:00
Mysticate	ac18dd3b79	Fixed iron golem select message. Removed slot change message.	2015-08-14 20:22:00 -04:00
libraryaddict	81f793d693	Iron Wizard: Commit progress	2015-08-14 20:49:17 +12:00
libraryaddict	a1ea03f74b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events ... Conflicts: Plugins/.idea/misc.xml Plugins/.idea/modules.xml Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java Plugins/Mineplex.Database/src/mineplex/database/Routines.java Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java	2015-08-14 19:44:56 +12:00
libraryaddict	7fb85f24d1	UtilEnt: Change CreatureLook to support LivingEntity, not just Creature	2015-08-14 19:15:35 +12:00
libraryaddict	33a6e4cb13	UtilEnt: Add CreatureLook method	2015-08-14 19:12:05 +12:00
Jonathan Williams	a2d7aa77fe	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-14 00:37:55 -05:00
Jonathan Williams	f5d934fe53	Fixed sync db calls for pets. ... Make sure to add/remove pets in mysql.	2015-08-14 00:37:43 -05:00
Mini-Chiss	80588a308b	balanaced brawler	2015-08-13 21:03:48 +02:00
Mini-Chiss	7157aaee2b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-13 20:56:20 +02:00
Mini-Chiss	a1ba2cffac	fixed needler not doing posion	2015-08-13 20:56:02 +02:00
Shaun Bennett	0b4dbab871	Change ticket command access to admin	2015-08-13 11:23:29 -05:00
Shaun Bennett	bd7317cf7b	Fix ticket command rollback >:D	2015-08-13 11:03:12 -05:00
Mysticate	eaad787075	Removed the base kit and replaced it with Iron Golem.	2015-08-13 08:16:33 -04:00
Mini-Chiss	5fa9135b08	renamed soccer to slimeball :)	2015-08-13 14:11:22 +02:00
Mini-Chiss	6ef3215516	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-13 13:25:41 +02:00
Mini-Chiss	534c91c706	remove items from inside soccer	2015-08-13 13:24:55 +02:00
Shaun Bennett	bc8aff31cb	Merge remote-tracking branch 'origin/master'	2015-08-13 06:12:24 -05:00
Shaun Bennett	af15476f19	Use login query to handle logins	2015-08-13 06:12:11 -05:00
Mini-Chiss	878ac82ade	fixed error!	2015-08-13 13:01:41 +02:00
Mini-Chiss	1487692609	completely disabled team armor in arcade. avoids typing it just as game starts.	2015-08-13 12:57:30 +02:00
Mini-Chiss	fc1a8e4e25	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-13 12:52:11 +02:00
Mini-Chiss	f3b58fe9b6	disabled team armor command in games D:	2015-08-13 12:51:57 +02:00
Shaun Bennett	e1d04354fb	Use dummy record for AddPlayer	2015-08-13 05:18:53 -05:00
Shaun Bennett	94c00cdb72	Adding some comments	2015-08-13 04:05:28 -05:00
Shaun Bennett	4d6e827739	Remove vote3!	2015-08-13 04:03:03 -05:00
Shaun Bennett	92c0e1452b	Add vote3	2015-08-13 04:01:53 -05:00
Shaun Bennett	0c68321e81	Global button	2015-08-13 03:58:05 -05:00
Shaun Bennett	11a4805c38	Stat stuff!	2015-08-13 03:54:23 -05:00
Shaun Bennett	4aac057956	Merge remote-tracking branch 'origin/master'	2015-08-13 03:32:40 -05:00
Shaun Bennett	05b1b91686	Carl!	2015-08-13 03:32:31 -05:00
Jonathan Williams	8476578bc0	Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master ... * commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324': Various Fixes.	2015-08-13 01:52:16 -05:00
Jonathan Williams	a308244966	Merge pull request #29 in MIN/mineplex from foo to master ... * commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits) minor grammar issue remove duplicate method manually updating something *crosses fingers* please work! please work... Freezes the time using doDayLightCycle instead of using a UpdateEvent. Fixed double-half-slabs (line 68) remove custom level to fix merge conflicts squirrel! fix getting snowballs from bedrock add jnr_dev to updaterank fix this agaaaaain FOOIFY IS A NOOB OKAY fix concurrentmodificationexception fix turfforts bug prevent STATIONARY_LAVA from breaking in creeper smash fix creeper smash exploding lava and bedrock fix spleef lava issue ishh also wanted this :P (let me know if I should remove it) ishh wanted it...k ...	2015-08-13 01:49:00 -05:00
Jonathan Williams	0ff7cee229	Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master ... * commit 'cc24bb78d3968c0c364164fb43e19724007e3833': Fixed Cows being able to fly if they had the Rabbit Farmer kit Fixed new classes not appearing in repository Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost	2015-08-13 01:45:56 -05:00
Mysticate	ed7dbddf4a	Redid how kits are done.	2015-08-13 00:12:28 -04:00
Mysticate	d7e28e9eb8	You can no longer have the option to Evolve if you kill while dead.	2015-08-12 13:28:31 -04:00
Mini-Chiss	4f163af909	fixed a uid problem with maps	2015-08-12 18:36:29 +02:00
Mysticate	a7da10cb34	You no longer remain "charging" when you die.	2015-08-12 12:12:26 -04:00
Mysticate	ad94b63903	Blaze and Enderman now take water damage.	2015-08-12 10:46:12 -04:00
Mysticate	0c3c9702d9	Small fixes. ... Added holograms to show kit abilities. Fireworks are now client side only. Decreased the # of emerald particles.	2015-08-12 09:44:55 -04:00
Mini-Chiss	fcfb2559b8	players cannot grab slime :O	2015-08-12 14:41:33 +02:00
Mini-Chiss	d1302e8dc3	fixed full msg	2015-08-12 12:42:59 +02:00
Mini-Chiss	5293e24469	fixed text	2015-08-12 11:58:40 +02:00
Mini-Chiss	cd5c7e7110	fixed kb	2015-08-12 11:23:19 +02:00
Shaun Bennett	37e5e97020	Fix experience reward displaying as game	2015-08-12 03:08:40 -05:00
Shaun Bennett	f81f5d82d6	Merge remote-tracking branch 'origin/master'	2015-08-12 03:00:16 -05:00
Shaun Bennett	30f20801c7	Lets hope everything works!	2015-08-12 03:00:07 -05:00
Mini-Chiss	860127631c	fixed item insta-despawn	2015-08-12 09:27:05 +02:00
Mini-Chiss	f19efb4a93	renamed football to soccer	2015-08-12 09:23:00 +02:00
Mini-Chiss	ade76791b3	optimized item cleaning	2015-08-12 09:12:49 +02:00
Sarah	a1ba0f6d86	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-08-12 09:01:20 +02:00
Sarah	2a40eee9e7	Increasing radius of items despawning.	2015-08-12 09:00:13 +02:00
Mini-Chiss	d6f17c609b	carl	2015-08-12 08:58:46 +02:00
Mini-Chiss	7ea148a802	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-12 08:58:36 +02:00
Sarah	e4eb286225	Fixing despawning.	2015-08-12 08:56:20 +02:00
Mini-Chiss	c00f9a7aaa	Merge branch 'Bonus'	2015-08-12 08:39:31 +02:00
Sarah	be699558f1	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-12 08:38:18 +02:00
Sarah	af19754bcd	Implementing Carl to Arcade.	2015-08-12 08:37:54 +02:00
Mini-Chiss	7cda53cb28	carl spinner in arcade/ ... tutorial fixes	2015-08-12 08:36:21 +02:00
Mini-Chiss	e8963cc2af	fixed paintbrush	2015-08-12 08:10:43 +02:00
Mini-Chiss	2ed388552b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-12 07:59:39 +02:00
Shaun Bennett	99a94251fd	Fixes	2015-08-12 00:56:20 -05:00
Shaun Bennett	8e4ae35256	Merge remote-tracking branch 'remotes/origin/master' into Bonus	2015-08-12 00:56:04 -05:00
Shaun Bennett	4549c810d4	Fix for voting	2015-08-11 22:59:59 -05:00
Mini-Chiss	a7cc3e1aa6	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-11 21:13:59 +02:00
Mini-Chiss	d41ab3432f	remove paintbrush when moved away	2015-08-11 21:13:45 +02:00
libraryaddict	72adf21bff	Gadget Paintball: Add particles on impact, change block break effect to stone break sound.	2015-08-12 06:23:13 +12:00
fooify	07bdbdde46	minor grammar issue	2015-08-11 09:55:10 -07:00
fooify	ddc663cc75	remove duplicate method	2015-08-11 09:52:04 -07:00
fooify	10f979772b	Merge remote-tracking branch 'origin/master' into foo	2015-08-11 09:51:13 -07:00
fooify	356060eedc	more amazing changes	2015-08-11 09:41:26 -07:00
fooify	c6ec60700c	monster maze is really working now! :D	2015-08-11 09:04:45 -07:00
Mini-Chiss	18843c2cc6	Merge branch 'Bonus'	2015-08-11 17:05:59 +02:00
Mini-Chiss	83a010c215	enabled summer sale msg	2015-08-11 17:05:41 +02:00
Mini-Chiss	89dab7ec85	some little fixes	2015-08-11 16:33:32 +02:00
Sarah	f7d9476191	Hidden egg fix	2015-08-11 13:53:36 +02:00
Sarah	5c7d140521	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-11 13:49:53 +02:00
Sarah	e25558fc91	Animation improvements.	2015-08-11 13:49:06 +02:00
Mini-Chiss	cfcfbbed3b	removed double gem	2015-08-11 13:34:32 +02:00
Mini-Chiss	49d54d4dd3	doesnt count rank thingy as reward if no rank. yknow	2015-08-11 13:22:58 +02:00
Mini-Chiss	b348c62a3f	Merge branch 'EventGameUpdates'	2015-08-11 13:01:33 +02:00
Sarah	2d7d7f6dde	Improving messages, animations and some Items.	2015-08-11 13:01:20 +02:00
Sarah	f3558b144c	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-11 12:05:23 +02:00
Sarah	c821523240	removed vote broadcast.	2015-08-11 12:04:54 +02:00
Shaun Bennett	1c484367a1	Add hasPoll	2015-08-11 04:57:45 -05:00
Shaun Bennett	3eb7e91fbb	Removing the magical 3	2015-08-11 04:38:37 -05:00
Sarah	8abefaf856	The magical +3.	2015-08-11 11:31:51 +02:00
Mini-Chiss	4c32f32ced	removed game reward type	2015-08-11 11:17:20 +02:00
Mini-Chiss	74b83d6851	fixed!	2015-08-11 10:56:07 +02:00
Mini-Chiss	184feec875	cleany and logic	2015-08-11 10:54:24 +02:00
Mini-Chiss	f66a0439e8	no need to gen so many	2015-08-11 10:34:33 +02:00
Mini-Chiss	a1c10a7ec5	clean up	2015-08-11 10:33:44 +02:00
Mini-Chiss	1c40478e6e	SPIN DOGGY SPIN	2015-08-11 10:32:49 +02:00
Shaun Bennett	fe153bee11	Fix revert issues	2015-08-11 03:19:27 -05:00
Shaun Bennett	184c592786	Merge remote-tracking branch 'origin/Bonus' into Bonus ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java	2015-08-11 03:12:55 -05:00
Shaun Bennett	13e7e58986	Creeper visual!	2015-08-11 03:09:21 -05:00
Shaun Bennett	c177307f70	Votifier fixes	2015-08-11 02:53:54 -05:00
Sarah	2c30d20cb1	changing OP method, setHost permissions and /e command.	2015-08-11 09:26:01 +02:00
Sarah	b99c526169	Implementing Carl message.	2015-08-11 09:09:16 +02:00
Shaun Bennett	5d3503b733	Carl rewards	2015-08-11 01:55:27 -05:00
Sarah	d457e3a955	changing the setOP Event.	2015-08-11 08:36:39 +02:00
Shaun Bennett	d2983b831e	Merge remote-tracking branch 'origin/Bonus' into Bonus	2015-08-11 00:35:44 -06:00
Shaun Bennett	d833385df4	Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes	2015-08-11 00:35:02 -06:00
Mini-Chiss	66f2a5df5e	renamed GAME	2015-08-11 08:32:12 +02:00
Mini-Chiss	b4e8b4f1ac	cant go spinnin while its a countin!	2015-08-11 08:24:28 +02:00
Sarah	3bedc4ce84	Improving animation timing.	2015-08-11 05:37:58 +02:00
Mysticate	bd414cd231	Merge remote-tracking branch 'origin/master' into Myst_EVO ... Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java	2015-08-10 19:47:53 -04:00
Mysticate	873a2f3c56	Changed slowness from 255 - 2	2015-08-10 19:45:40 -04:00
Mysticate	e81a3f7ecd	Added a method to UtilAlg.	2015-08-10 14:32:49 -04:00
Mysticate	a618b19b73	Small changes	2015-08-10 14:32:35 -04:00
Sarah	fef269b856	Fixing /e set.	2015-08-10 17:28:27 +02:00
Sarah	186e3028c2	removing temp fix "there was an error processing your request" for the Spinner.	2015-08-10 17:15:56 +02:00
Sarah	3be811e480	Fixing Spinner announcements.	2015-08-10 17:08:03 +02:00
Sarah	ed7b8949bb	Adding SpinnerFiller and SpinnerRewards.	2015-08-10 17:04:47 +02:00
Sarah	2253a63e96	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-10 16:43:05 +02:00
Sarah	c6beb122e3	Adding firework animations for spinner.	2015-08-10 16:42:43 +02:00
Mini-Chiss	ad8781fd84	Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus	2015-08-10 16:14:24 +02:00
Mini-Chiss	18d11f7d68	new enums	2015-08-10 16:13:17 +02:00
Sarah	7492ed310e	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-10 15:33:26 +02:00
Sarah	65fc81a2aa	improving animations again.	2015-08-10 15:33:00 +02:00
Mini-Chiss	db70df1bf4	Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus	2015-08-10 14:51:39 +02:00
Mini-Chiss	65b51a137c	new party tute room	2015-08-10 14:50:44 +02:00
Mysticate	1804d668e1	A few small tweaks. Removed the "Frozen" effect.	2015-08-10 08:42:03 -04:00
Sarah	aea081c292	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-10 14:01:12 +02:00
Sarah	5781009f4e	Improving animations and some text.	2015-08-10 14:00:40 +02:00
Mini-Chiss	bd2c9aa5e6	hub stuff	2015-08-10 14:00:02 +02:00
Shaun Bennett	aa13bcf5c6	Bug fix!	2015-08-10 04:54:01 -05:00
Shaun Bennett	adb76b0681	Fix giving out gold	2015-08-10 04:51:46 -05:00
Shaun Bennett	8745884153	Various fixes	2015-08-10 04:51:11 -05:00
Shaun Bennett	b8b19ed4a5	Merge remote-tracking branch 'remotes/origin/master' into Bonus ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2015-08-10 03:24:59 -05:00
Shaun Bennett	6f8d6f8a40	Move Bonus and Poll to core	2015-08-10 01:55:50 -05:00
Shaun Bennett	a0be3fa964	Use atomic mysql operations for modifying tickets	2015-08-10 01:19:10 -05:00
Shaun Bennett	511cc76bef	Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working)	2015-08-10 00:47:36 -05:00
Shaun Bennett	28806aaf0a	Update Bonus amounts, Attempting to fix Votifier plugin for EU/US	2015-08-10 00:33:54 -05:00
Mysticate	463dfc7049	Minor Tweaks. ... • Fixed wrong evo location • Added a "Frozen" effect when evolving.	2015-08-10 00:21:48 -04:00
Mysticate	a19cd3559d	Renamed "Shift" to "Crouch"	2015-08-09 23:26:59 -04:00
Mysticate	158dcdc01e	Created a new way to Evolve. ... • Getting a kill presents you the option "Hold Shift to Evolve" • Holding shift for about 5 seconds evolves you as normal.	2015-08-09 23:25:26 -04:00
Shaun Bennett	d20fe54010	Disable carl features when carl can't be found	2015-08-09 16:36:48 -05:00
Mysticate	f8a6a25b46	Various Fixes. ... • Merged w/ master • Changed to William's method of Projectile limiting. - Prevented TNT hitting Teammates • Fixed gem count for Sniper • Added gems for direct hits + TNT Thrown • Removed assists counting for kills in 6 kill.	2015-08-09 15:01:27 -04:00
Mysticate	d9a8830e75	Few changes	2015-08-09 14:34:55 -04:00
Mini-Chiss	c2d066a576	ui fixes	2015-08-09 19:31:24 +02:00
Mini-Chiss	41dcc564c9	polish polish polish ... MAKE IT SHINE!	2015-08-09 19:02:07 +02:00
Mini-Chiss	ee65c72e86	and wizards!	2015-08-09 18:46:02 +02:00
Sarah	8c66ef7f15	changing Hub items and adding Profile GUI.	2015-08-09 18:33:44 +02:00
Mini-Chiss	fdfc9ae99d	longer games wont announce stay msgs	2015-08-09 18:17:29 +02:00
Sarah	ac5ff08fad	Git fix	2015-08-09 17:23:38 +02:00
Mini-Chiss	5a7de8ef3d	hub fixes	2015-08-09 17:21:56 +02:00
Sarah	0d70fb6b96	removing deop of Admins and adding OP condition to setHost.	2015-08-09 16:55:10 +02:00
Sarah	941e746ca9	Finalizing Poll GUI in Carl's GUI.	2015-08-09 16:47:03 +02:00
Sarah	85c8e42f53	Finalizing and improving the Carl spinner and adding creeper explosion animations.	2015-08-09 15:00:54 +02:00
Mysticate	b9edb92c1e	Ready for full on testing.	2015-08-09 01:08:43 -04:00
Mini-Chiss	b974fcf838	map parser fixes	2015-08-09 00:09:26 +02:00
Shaun Bennett	e6519206af	Add event to be called when a player tries to buy a carl spin	2015-08-08 16:29:03 -05:00
Mysticate	5298fa341e	Removed the revolving thing.	2015-08-08 16:13:54 -04:00
Mini-Chiss	cbb0cb96c8	ensured white	2015-08-08 13:54:35 +02:00
Mini-Chiss	e030331565	fixed some bugs	2015-08-08 13:51:37 +02:00
Mini-Chiss	fa7f19bde5	removed debug	2015-08-08 13:47:30 +02:00
Mini-Chiss	328c31de88	hub Update ... fixed bad gameid	2015-08-08 13:47:09 +02:00
Shaun Bennett	4f6dfdb856	Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes	2015-08-08 06:35:25 -05:00
Mini-Chiss	eab7aa59f2	hub update!	2015-08-08 09:27:49 +02:00
Mini-Chiss	47cb98066d	Hub fixes	2015-08-08 08:19:07 +02:00
fooify	db521668a9	more changes! it's getting pretty cool now x)	2015-08-07 14:20:15 -07:00
Mini-Chiss	33c96f51ae	fixed some stuff	2015-08-07 22:59:50 +02:00
Mini-Chiss	090c1f135d	Merge branch 'SarahsAwesomeBugFixes' ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java	2015-08-07 21:48:35 +02:00
Mini-Chiss	b22706e649	hub update part 1	2015-08-07 21:45:38 +02:00
Mysticate	858e57bb0d	edited a few things	2015-08-07 14:39:29 -04:00
fooify	f70b1231ab	AI fixes and such for Monster Maze	2015-08-07 10:32:31 -07:00
Mysticate	a9350bfacd	Merge remote-tracking branch 'origin/master' into Myst_EVO	2015-08-07 11:58:53 -04:00
Shaun Bennett	f76d9b0d37	Replace Consumers with Callbacks	2015-08-07 04:20:54 -05:00
Shaun Bennett	5ebc7080ee	Push fixes	2015-08-07 04:13:09 -05:00
Jonathan Williams	fcfb63c47d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-07 02:23:10 -05:00
Jonathan Williams	320a3efe5b	Remove some debug code.	2015-08-07 02:22:58 -05:00
Jonathan Williams	e8c60e6e84	Added storage of pets in mysql. Going to have live while backend process is copying data over. ... Updated ServerTypePage to resolve clicking issues with solo/team pages.	2015-08-07 02:22:13 -05:00
Sarah	181b778a9c	Fixing some bugs and disallow MPS while disguised.	2015-08-07 07:39:40 +02:00
Morten	f37e25e9d7	Finish push for today <3	2015-08-07 07:03:15 +02:00
Morten	608e8bf693	For Sarah <3	2015-08-07 05:40:16 +02:00
Shaun Bennett	5f435a079e	Update vote button	2015-08-06 21:59:21 -05:00
Shaun Bennett	be18dc1bf5	Add experience rewards to reward manager	2015-08-06 21:41:56 -05:00
Shaun Bennett	6311ceaa0f	Reward work for new Game reward rarity and setup for carl, work on carl spinner	2015-08-06 21:15:17 -05:00
Morten	1680b652db	Added Hat layer skin ... Added Sneak animation With love from Morten <3	2015-08-07 03:10:17 +02:00
Shaun Bennett	44e30a0903	SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui	2015-08-06 15:34:56 -05:00
Sarah	d8041ba582	Fixing Players can disguise as disguised Players.	2015-08-06 20:57:56 +02:00
fooify	67bbd3a605	kk did merge	2015-08-06 10:16:37 -07:00
fooify	0a9f7cc888	Merge remote-tracking branch 'origin/master' into monster-maze	2015-08-06 10:13:54 -07:00
fooify	f27ca9ba71	still working on merge	2015-08-06 10:13:34 -07:00
fooify	42868b2a0a	trying to merge...	2015-08-06 10:09:13 -07:00
fooify	9e92a3a68d	more changes (not really ready for testing yet though...)	2015-08-06 09:44:00 -07:00
Mini-Chiss	ebbc13c0a4	lowered headshot damage	2015-08-06 17:07:52 +02:00
Shaun Bennett	c67f4fa7e6	Votifier fixes	2015-08-06 06:45:47 -05:00
Sarah	4a10f8d71a	fixing very last bugs. Ready to push!!!	2015-08-06 13:23:38 +02:00
Shaun Bennett	35d999d747	Remove some debug messages	2015-08-06 05:56:31 -05:00
Shaun Bennett	9e9f9862d0	Bonus bonus bonus!	2015-08-06 05:47:32 -05:00
Sarah	6947b54e66	16 char limit and Steve Skin.	2015-08-06 09:45:02 +02:00
Sarah	5809359449	Random Player disguises.	2015-08-06 09:19:19 +02:00
Sarah	208ce95c97	No youtuber Disguise.	2015-08-06 09:11:39 +02:00
Sarah	b52a9477fe	No Staff disguises!	2015-08-06 09:07:30 +02:00
Sarah	abf12dbbfa	Merge branch 'SarahsAwesomeBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes	2015-08-06 08:44:36 +02:00
Sarah	6a3d888f5b	fix git	2015-08-06 08:44:16 +02:00
Sarah	16a8164030	Fixing last bugs and disabling coin bombs while diguised.	2015-08-06 08:42:09 +02:00
Shaun Bennett	4cad99eb76	Lots of bonus work, start adding Votifier plugin	2015-08-06 00:45:39 -05:00
fooify	b5d1202674	YET MORE WORK ON MM	2015-08-05 13:09:26 -07:00
Mini-Chiss	fbaec460dc	removed debug	2015-08-05 20:26:50 +02:00
Mini-Chiss	7fbe29d0af	Merge branch 'SarahsAwesomeBugFixes' of ssh://184.154.0.242:7999/min/mineplex into SarahsAwesomeBugFixes	2015-08-05 20:25:38 +02:00
Mini-Chiss	ea0c6075f2	rank sifx	2015-08-05 20:25:23 +02:00
fooify	551451c533	moar changes	2015-08-05 10:30:27 -07:00
Sarah	a15e8e1b95	Fixing more /disguise bugs.	2015-08-05 15:23:16 +02:00
Sarah	83da6b7a9a	Improving the /disguise command even more. ;D	2015-08-05 13:32:05 +02:00
Mini-Chiss	e86e7b624e	remnvoed special case for me	2015-08-05 10:28:05 +02:00
AlexTheCoder	cc24bb78d3	Fixed Cows being able to fly if they had the Rabbit Farmer kit	2015-08-05 03:07:19 -04:00
Mini-Chiss	cba1c3bcca	disallowed negative stats completely	2015-08-05 09:03:22 +02:00
Mini-Chiss	fa2a585dac	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-05 08:57:47 +02:00
Mini-Chiss	5d7cc59909	fixed cases where negative stats were being uploaded	2015-08-05 08:56:52 +02:00
Sarah	91de6a1852	last fix...	2015-08-05 08:40:09 +02:00
Jonathan Williams	da5387c54f	Fixed ConcurrentModification for ServerManager cooldowns.	2015-08-05 01:33:09 -05:00
Sarah	511c61611a	fixing earlier commit.	2015-08-05 08:32:52 +02:00
Sarah	e55557e1fd	Improving the /disguise command.	2015-08-05 07:57:52 +02:00
Shaun Bennett	bcd4f4f9e2	Open gui through npc	2015-08-05 00:41:50 -05:00
Jonathan Williams	95bb4ab04b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-04 13:56:41 -05:00
Jonathan Williams	b2116cc7e8	Merge branch 'OldServerSelector'	2015-08-04 13:56:23 -05:00
Jonathan Williams	813dfb26b3	Finalized revert to old server menus. ... Tied in solo/team buttons to use old server menu as well.	2015-08-04 13:54:06 -05:00
Jonathan Williams	e5dd4d1ebf	Updated MOTD	2015-08-04 13:13:31 -05:00
Mini-Chiss	88fe5b3ec6	Merge branch 'MPS-Maps' ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java	2015-08-04 17:37:32 +02:00
Mini-Chiss	1fd5c51f03	DINGO ATE MY BABY	2015-08-04 17:33:23 +02:00
Sarah	ec3bc7cc38	Try fixing the map selection.	2015-08-04 17:04:49 +02:00
William Burns	644d6c9914	Whitelist fixes. Implemented MapSource.	2015-08-04 11:21:58 +01:00
Shaun Bennett	b33b0ac935	More bonus work	2015-08-04 04:00:51 -05:00
Mini-Chiss	13d139d197	team kills/deaths only store for 3 games now	2015-08-04 08:46:00 +02:00
Mysticate	d88a37832b	Work on evolving	2015-08-03 18:22:31 -06:00
AlexTheCoder	a86fdc3c21	Fixed new classes not appearing in repository	2015-08-03 18:45:16 -04:00
AlexTheCoder	b53b98d6e3	Milk The Cow: ... New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost New Perk - Steady Hands: - Lowers the amount of milk lost by a dead player to 3 - Removes losing milk in farmer's bucket when a cow charges into them New Kit - Sturdy Farmhand: - Iron skin damage reduction of 2.0 - Implements Steady Hands perk - 2000 gems	2015-08-03 18:30:42 -04:00
Mini-Chiss	2d07cc571c	reduced invis in OITQ	2015-08-03 18:53:00 +02:00
Mini-Chiss	2f571aed25	fixed bugs from my vel fixes, WHOOPS. normalisation :(	2015-08-03 18:19:31 +02:00
Jonathan Williams	a623cc16ce	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-03 09:37:12 -05:00
Mini-Chiss	40e2b6216e	oops, was right before, reverting change.	2015-08-03 16:30:38 +02:00
Mini-Chiss	f350e4efe5	further fixed gem stuff!	2015-08-03 16:25:31 +02:00
Mini-Chiss	67fd0e2c1d	fixed MPS awards formatting	2015-08-03 16:24:43 +02:00
Mini-Chiss	ab670a03fb	fixed logic error that was displaying gems wrong	2015-08-03 16:23:50 +02:00
Mini-Chiss	e10d26dae1	reduced respawn time in OITQ ... removed respawn msg for short respawn times	2015-08-03 16:18:59 +02:00
Mini-Chiss	ccdb859f11	lowered mythical change a little :)	2015-08-03 16:11:11 +02:00
Shaun Bennett	e200ddd777	Merge branch 'master' into Bonus ... # Conflicts: # Plugins/.idea/misc.xml	2015-08-03 08:32:45 -05:00
Jonathan Williams	90ea3d4cff	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-03 08:14:20 -05:00
Jonathan Williams	ab20d35917	Wipe personal server groups on restart of monitor. ... Cleanup of unused code.	2015-08-03 08:08:51 -05:00
Mini-Chiss	5e06f16c0d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-03 15:08:40 +02:00
William Burns	817b8b03f6	Whitelist fixes etc.	2015-08-03 13:40:13 +01:00
Sarah	fc412b0782	Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG.	2015-08-03 14:36:51 +02:00
William Burns	0c5cc25634	Stuff	2015-08-03 12:48:17 +01:00
Jonathan Williams	eb16cd755a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-03 05:55:57 -05:00
Jonathan Williams	37b779f108	Fixes for servers.	2015-08-03 05:55:33 -05:00
William Burns	5b598009b9	Merge branch 'master' into MPS-Maps	2015-08-03 11:53:03 +01:00
William Burns	bf292ecd39	Merge remote-tracking branch 'origin/master' ... # Conflicts: # Plugins/.idea/encodings.xml # Plugins/.idea/modules.xml	2015-08-03 11:51:46 +01:00
Shaun Bennett	bd9d222cff	Fix IntellIJ Files	2015-08-03 05:50:02 -05:00
William Burns	44ee735f4a	Merge branch 'master' into MPS-Maps	2015-08-03 11:46:38 +01:00
William Burns	4ad19e4579	Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps	2015-08-03 10:52:00 +01:00
Mini-Chiss	7c028ae936	fixed skywars teams icon in MPS	2015-08-03 11:44:13 +02:00
Mini-Chiss	bb2e15c4fd	made it so games can set another game as its 'kit source' so games can share kit unlocks	2015-08-03 11:38:16 +02:00
William Burns	1ca3c8527a	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-03 10:01:06 +01:00
Mini-Chiss	8d7b7f8c8b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-03 10:56:54 +02:00
Mini-Chiss	1d0bfbdf2d	fixed team sheep displaying in UHC lobby	2015-08-03 10:56:23 +02:00
Jonathan Williams	6c0666c59b	Fix for server groups / teams.	2015-08-03 03:20:27 -05:00
Mini-Chiss	b26e01649b	removed requirement for ach kit	2015-08-03 10:13:46 +02:00
Mini-Chiss	eac8a3cd1c	fixed OITQ kit being unobtainable	2015-08-03 10:12:37 +02:00
Mini-Chiss	a87b3a9284	fixed kits not sharing for team vers	2015-08-03 10:10:29 +02:00
Mini-Chiss	8ec271bd82	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-03 10:06:30 +02:00
Mini-Chiss	472409dc4b	fixed broadcast formatting	2015-08-03 10:06:15 +02:00
Jonathan Williams	302252f193	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-03 02:56:31 -05:00
Jonathan Williams	af0d769d3d	Fixed skywars quick shop. ... Fixed issue with skywars not opening. Fixed chest size for MPS	2015-08-03 02:56:24 -05:00
Mini-Chiss	5bb2f80b8e	fixed text	2015-08-03 09:54:34 +02:00
William Burns	6ccc897841	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-03 08:53:38 +01:00
Mini-Chiss	72c473ad6b	removed annoying mineplex thing from subtext in news	2015-08-03 09:51:10 +02:00
Jonathan Williams	530c40ad0c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-03 02:07:31 -05:00
Jonathan Williams	adcd91bf61	Servers with more than 40 max slots always send to largest server. ... Fixed space in Solo lore.	2015-08-03 02:07:23 -05:00
Mini-Chiss	2e1bccb3ad	DUN ALLOW overful	2015-08-03 09:02:28 +02:00
Mini-Chiss	6a1e5d6bfc	changed item text	2015-08-03 08:23:49 +02:00
Jonathan Williams	c32074e733	Fixed MPS/Event server guis so they open up like old. ... Changed sticks to player heads in solo/team selection.	2015-08-03 00:53:06 -05:00
Jonathan Williams	bfaa0e6849	Fixed event/mps hardcode.	2015-08-02 23:51:43 -05:00
Ty Sayers	58933fc855	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-08-02 21:19:00 -04:00
Ty Sayers	944a4a9535	Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process.	2015-08-02 21:18:24 -04:00
Jonathan Williams	3b090d369d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-02 19:41:49 -05:00
Jonathan Williams	a561bbbf12	Added hardcode for EVENT/MPS :D	2015-08-02 19:41:42 -05:00
Shaun Bennett	38cc318387	Update JOOQ, downcast BigInteger to Long in stats for now	2015-08-02 19:36:24 -05:00
Shaun Bennett	cadd21c18b	More bonus work	2015-08-02 19:12:39 -05:00
Ty Sayers	32a2687991	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-08-02 20:00:15 -04:00
Jonathan Williams	d9a641fd92	Updated ServerManager to read server npc stuff from redis. ... Updated ServerGroup to have NPC name in it.	2015-08-02 18:59:43 -05:00
Jonathan Williams	a2250ea343	Fix for blocking logins if redis can't add account cache.	2015-08-02 18:59:13 -05:00
Ty Sayers	4852e69991	Temporary un-finished changes for adding in team/solo UI pages and allowing players to select.	2015-08-02 19:19:40 -04:00
Jonathan Williams	f520908f8d	Added team and portal location info to server group.	2015-08-02 17:52:51 -05:00
Jonathan Williams	41189b9838	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-02 17:23:17 -05:00
Ty Sayers	fa2bcf7f69	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-08-02 18:21:01 -04:00
Ty Sayers	70c1b883db	Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups.	2015-08-02 18:20:52 -04:00
Jonathan Williams	d3ba621e86	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-02 17:00:49 -05:00
Mini-Chiss	0a84bd69d8	fixed some OITQ stuff	2015-08-02 23:17:23 +02:00
Ty Sayers	c2f6c402da	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-08-02 13:25:09 -04:00
Ty Sayers	612d967aa0	Add ability for auto-joining of gametypes to bypass manual server selection by player.	2015-08-02 13:24:59 -04:00
Mysticate	0a20a04903	Used packets to spectate the rotation bat.	2015-08-02 10:48:00 -06:00
Mini-Chiss	4cc810f1c0	Merge branch 'Myst_KITS'	2015-08-02 17:55:53 +02:00
libraryaddict	4fdd42c599	Mysticate's request: Add PacketPlayOutCamera	2015-08-03 01:51:15 +12:00
Mini-Chiss	8ea967b37e	fixed possible NPE	2015-08-02 12:35:25 +02:00
Shaun Bennett	06be7b2cdd	Fix stats	2015-08-02 05:24:25 -05:00
Shaun Bennett	db15ffad72	Bonus changes + Update jooq	2015-08-02 05:17:51 -05:00
Mini-Chiss	638406254b	refactored a little so theres no data stored in the util	2015-08-02 12:07:00 +02:00
Mini-Chiss	afc41c8831	converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity	2015-08-02 11:50:26 +02:00
Shaun Bennett	11e49b9678	Some updates	2015-08-02 04:28:57 -05:00
Mini-Chiss	ac4755a5a9	Fixed incorrect velocity	2015-08-02 11:24:34 +02:00
Mysticate	9c14e3d35a	Worked on evolution	2015-08-01 17:24:12 -06:00
fooify	519449e015	lots of stuff (:	2015-08-01 11:42:32 -07:00
Mini-Chiss	7910170327	fixed achievemnt amount	2015-08-01 18:39:18 +02:00
William Burns	f361ae94dc	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... # Conflicts: # Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml # Plugins/.idea/compiler.xml # Plugins/.idea/encodings.xml # Plugins/.idea/misc.xml # Plugins/.idea/modules.xml	2015-08-01 16:09:15 +01:00
William Burns	a964f343c7	xml files are ew	2015-08-01 14:55:01 +01:00
Mysticate	62072077c1	Fixed evolution rotation	2015-08-01 00:47:44 -06:00
Jonathan Williams	992c0fc36f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-01 01:12:24 -05:00
Jonathan Williams	d3c5d0cbe6	Only store account cache stuff for 6 hours. ... Update MOtd.	2015-08-01 01:12:01 -05:00
Shaun Bennett	fd65f27f0f	Fix some typos/formatting issues	2015-07-31 10:01:19 -05:00
fooify	e4141a1b72	Merge remote-tracking branch 'origin/master' into snow-sprint	2015-07-31 07:32:17 -07:00
Mini-Chiss	ae8d351145	Merge branch 'SSM2PlayerTeams'	2015-07-31 14:09:55 +02:00
Sarah	fba10e4cbd	fixing the long term "Kit" bug ;D	2015-07-31 14:08:08 +02:00
Sarah	b2c538b189	little tag fix.	2015-07-31 13:40:39 +02:00
Sarah	60a1768821	Fixing Team display bug on disbanding.	2015-07-31 13:05:28 +02:00
Mini-Chiss	b2a567673c	disabled sale msg ... added double gem weekend	2015-07-31 09:53:52 +02:00
Mysticate	53a3a29cd2	Extreme revisions. Cheers!	2015-07-31 00:50:32 -06:00
fooify	e59f2751f3	more stuff changed to snow sprint	2015-07-30 17:31:26 -07:00
fooify	014cac31f0	more changes to snow sprint	2015-07-30 14:04:39 -07:00
fooify	6c39c08abf	some progress on snow sprint	2015-07-30 11:59:04 -07:00
Mini-Chiss	a3d768af6b	added res pack for HH	2015-07-30 15:07:40 +02:00
Mini-Chiss	31fd19aab5	added res pack for CC	2015-07-30 15:07:05 +02:00
Mini-Chiss	8d7c42134b	fixed mounts having nametags	2015-07-30 14:54:23 +02:00
Mini-Chiss	8a5088e181	fixed SGT deathmatch not working	2015-07-30 14:47:59 +02:00
Mini-Chiss	45d117a95a	added armor hotbar to smash ... fixed scoreboard in snowfight	2015-07-30 14:45:28 +02:00
Mini-Chiss	0cf333ec00	lowered win req	2015-07-30 14:12:17 +02:00
Mysticate	f02924987e	Did things	2015-07-30 04:30:19 -06:00
Mini-Chiss	8ef93c0b33	Merge branch 'SSM2PlayerTeams'	2015-07-30 08:42:50 +02:00
Sarah	30fa3b3309	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams	2015-07-30 03:07:41 +02:00
Sarah	37e432f0b2	Git fix.	2015-07-30 03:07:21 +02:00
Sarah	bf75594853	Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams	2015-07-30 02:33:51 +02:00
Sarah	de4d0a7dc3	Fixing needler, projectiles in SW and "Banannas...".	2015-07-30 02:33:06 +02:00
Mysticate	a5d73d791a	Thing	2015-07-29 16:14:38 -06:00
fooify	b623f025ff	manually updating something	2015-07-29 14:31:11 -07:00
fooify	7c4786e7d2	Merge remote-tracking branch 'origin/master' into foo	2015-07-29 14:15:24 -07:00
fooify	5da23fa322	Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo	2015-07-29 14:13:07 -07:00
fooify	db5c5a9888	*crosses fingers* please work!	2015-07-29 14:12:52 -07:00
Mini-Chiss	97a144150b	fixed an NPE that was causing games not to end in MS	2015-07-29 21:51:18 +02:00
fooify	389bf7a74c	please work...	2015-07-29 10:55:03 -07:00
Mysticate	ab49407584	Things	2015-07-29 11:52:44 -06:00
Aaron Brock	7065ea7319	Freezes the time using doDayLightCycle instead of using a UpdateEvent. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-07-29 10:49:20 -07:00
Aaron Brock	d583598477	Fixed double-half-slabs (line 68) ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-07-29 10:49:20 -07:00
Mini-Chiss	be910cced9	gamemode color change	2015-07-29 17:00:36 +02:00
Mini-Chiss	0e55ce1879	removed old hint	2015-07-29 16:54:30 +02:00
Mini-Chiss	1004203b34	fixed up some merge issues	2015-07-29 16:48:49 +02:00
William Burns	13af2cec74	Pick highest voting button	2015-07-29 15:44:29 +01:00
Mini-Chiss	52844d7b80	Merge branch 'EventGameUpdates' ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java	2015-07-29 16:41:35 +02:00
Mini-Chiss	71bedbe0fc	Merge branch 'WitherAssaultUpdate'	2015-07-29 16:37:29 +02:00
Mini-Chiss	c32e959f61	Merge branch 'SnowFightUpdate'	2015-07-29 16:36:33 +02:00
Morten	1a27dea32c	Why was these not added...	2015-07-29 16:35:57 +02:00
Mini-Chiss	d570cce1b0	Merge branch 'WitherAssaultUpdate'	2015-07-29 16:33:06 +02:00
Mini-Chiss	862cdae14f	team modes	2015-07-29 16:32:11 +02:00
Mini-Chiss	e47a343e2e	added mode for team games	2015-07-29 16:20:49 +02:00
Morten	f714bfbb0f	Adding testing achievement lol	2015-07-29 16:06:43 +02:00
Morten	b5d3ad0e0d	Adding perks	2015-07-29 16:05:43 +02:00
Sarah	9c5ca750cf	Improving /e mob command and implementing other commands.	2015-07-29 15:53:45 +02:00
Mini-Chiss	ab2c865ab3	better colors	2015-07-29 15:48:12 +02:00
Mini-Chiss	51cef64554	improved text	2015-07-29 15:29:12 +02:00
Mini-Chiss	deba3f23fa	Merge branch 'MPS-Maps'	2015-07-29 15:27:11 +02:00
William Burns	2b3fec754f	Colour change cause colour!	2015-07-29 14:25:38 +01:00
William Burns	3bc66f16b6	Woo a push	2015-07-29 14:22:49 +01:00
Mini-Chiss	b2db2e988f	Merge branch 'WitherAssaultUpdate' ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java	2015-07-29 15:13:28 +02:00
Mini-Chiss	1c2bd988f9	fixed spawns for team gameds	2015-07-29 15:10:21 +02:00
William Burns	f6e64d25a2	Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps	2015-07-29 13:27:45 +01:00
William Burns	f82defb1db	Whitelist	2015-07-29 13:27:26 +01:00
Mini-Chiss	30f0b3cb60	fixed close spawn stuff	2015-07-29 14:25:15 +02:00
Mini-Chiss	c9c3db70f3	Merge branch 'SSM2PlayerTeams' ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-07-29 14:08:17 +02:00
Mini-Chiss	932fe197b4	Merge branch 'perm-changes' ... Conflicts: Plugins/.idea/encodings.xml reverted it.	2015-07-29 14:06:21 +02:00
Mini-Chiss	ef89b96144	fixed game page bug	2015-07-29 14:02:56 +02:00
Mini-Chiss	b42be044ae	whtielisted MPS will be hidden from GUI	2015-07-29 13:20:20 +02:00
Mini-Chiss	e0ab853e57	Merge branch 'MPS-Maps' ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java	2015-07-29 13:03:05 +02:00
Mini-Chiss	c3e07522b4	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-07-29 12:22:11 +02:00
Ben Sihota	5af68e5628	Fulfill Shaun's request	2015-07-28 23:55:27 -07:00
Shaun Bennett	2305e8bbaa	Store Kills, Deaths, Murders, Wins, Losses in database ... Add Murder	2015-07-29 01:48:49 -05:00
Jonathan Williams	10549601f8	Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master ... * commit 'd0a45461d07904f70b5e42dee391f69843fb3978': Fixed bug with direct hit Final tweaks. this is as good as it's goign to get! ;d Tweaks Fixed waller achievement thing Fixed waller kit bc I was stupid before ;c Added an exception for a map to make it night. Various improvements. Added an achievement, removed team one, touched up another. Swag.	2015-07-29 00:15:41 -05:00
Mysticate	d0a45461d0	Fixed bug with direct hit	2015-07-28 21:25:29 -06:00
Mysticate	3e0eb03112	Final tweaks. this is as good as it's goign to get! ;d	2015-07-28 20:39:55 -06:00
Mysticate	99946ef1f3	Tweaks	2015-07-28 17:29:51 -06:00
Aaron Brock	da94c30c02	Stuff ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-07-28 18:06:00 -04:00
Aaron Brock	971908d38b	Stuff ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-07-28 17:52:43 -04:00
Aaron Brock	832fb4638a	More things ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-07-28 17:42:00 -04:00
Aaron Brock	b5e8c0886e	Stuff and things ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-07-28 17:38:26 -04:00
Ben Sihota	e4da4aa0ed	Remove NPC commands	2015-07-28 10:14:25 -07:00
Mysticate	2e58b75a1b	Fixed waller achievement thing	2015-07-28 08:51:21 -04:00
Mysticate	dd53d268e4	Fixed waller kit bc I was stupid before ;c	2015-07-28 08:46:37 -04:00
Mysticate	c5cf306097	Thing	2015-07-28 08:41:35 -04:00
Christopher Jozsa	c2cb86087a	Merge pull request #22 in MIN/mineplex from horus-bug-fixes to master ... * commit '02f1211ddb7688737dc66605c174167cce708d0e': Misc Fix numerous trello bugs Update IntelliJ builds	2015-07-28 02:24:15 -05:00
Mysticate	0e00086b9e	Redid evolution!	2015-07-28 00:15:41 -04:00
Shaun Bennett	16bad71dcc	1.8 Updates	2015-07-27 20:26:37 -05:00
Shaun Bennett	5895adaeca	Update Craftbukkit to latest spigot build	2015-07-27 19:40:35 -05:00
Shaun Bennett	da3500cc32	Merge remote-tracking branch 'remotes/origin/master' into MC_1.8 ... # Conflicts: # Plugins/Libraries/craftbukkit.jar # Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java # Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java # Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java # Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java # Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java # Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java # Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java # Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java # Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java	2015-07-27 19:39:18 -05:00
William Burns	8385c8a7c7	Whitelist fix	2015-07-27 22:18:41 +01:00
William Burns	76e5d3d562	Finish update	2015-07-27 18:18:37 +01:00
Sarah	aaf4991737	Fixing Banana team.	2015-07-27 18:31:01 +02:00
Sarah	572ae1e99b	Updating Team names.	2015-07-27 18:22:24 +02:00
Mini-Chiss	0557e10257	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-07-27 15:53:57 +02:00
Mini-Chiss	0c4a7a847f	fixed annoying color bug!	2015-07-27 15:53:39 +02:00
Conrad	421eb12228	Add jedis pool caching. ... This commit seeks to reduce the number of idle connections to redis that our code uses by making clients share thread-safe connection pools (which is the point of a connection pool). This only changes utility methods to generate and access jedis pools, and does not seek to address any issues relating to the use of the connections that may or may not be causing problems. The changes are as follows: 1. Add a static cache of all connection pools - Each connection pool is distinguished by its ip and port. Two requested connections to the same ip:port combinations will use the same connection pool. 2. Increase the max size of each pool to 20 - Overall, by having fewer idle connections, this commit should still end up with fewer connections going at any given time. 3. Make explicit setting to block while waiting for a connection - This should already be the default, but it is made explicit just in case.	2015-07-27 08:50:04 -04:00
Ben Sihota	7d9fd61c8e	Display changes	2015-07-26 22:31:40 -07:00
Ben Sihota	0b53bca385	Needed permission changes for Jr Developers (Pending approval)	2015-07-26 18:58:35 -07:00
Ben Sihota	47d410370d	Merge branch 'horus-bug-fixes'	2015-07-26 18:20:39 -07:00
Ben Sihota	a917dc4714	Merge remote-tracking branch 'origin/master'	2015-07-26 18:19:35 -07:00
Ben Sihota	02f1211ddb	Misc	2015-07-26 18:12:56 -07:00
Mini-Chiss	8fd3a3a838	Merge branch 'Myst_LOBBERS'	2015-07-26 18:31:55 +02:00
Mini-Chiss	e0b1567e54	Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS	2015-07-26 18:31:11 +02:00
Jonathan Williams	727427165f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-26 08:49:49 -07:00
Jonathan Williams	26ed7ebb94	Fixes to redis ... Fixes for stat handler.	2015-07-26 08:49:35 -07:00
Mini-Chiss	1247f33b1e	end game stats will display, even if no gems awarded.	2015-07-26 11:43:24 +02:00
Mysticate	0586e5fb77	Added an exception for a map to make it night.	2015-07-26 00:27:09 -04:00
Mysticate	4ceb156e69	Various improvements.	2015-07-25 23:44:55 -04:00
Mysticate	0fd59e9fdb	Added an achievement, removed team one, touched up another. Swag.	2015-07-25 21:50:37 -04:00
William Burns	cf61b50d98	More changes.	2015-07-25 17:35:43 +01:00
Mini-Chiss	2b240f3dfa	removed visdata debug	2015-07-25 17:16:20 +02:00
Mini-Chiss	dffde68982	fixed bug ... removed debug	2015-07-25 17:11:02 +02:00
Mini-Chiss	7c7b166b4d	reduced particles a little	2015-07-25 16:05:12 +02:00
Mini-Chiss	aebd3eeb4f	Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS	2015-07-25 15:56:23 +02:00
Mysticate	9feac87a15	Fixed not being able to buy Armorer. Lowered view distance on particles.	2015-07-25 09:51:23 -04:00
William Burns	65ea7b99ab	Merge remote-tracking branch 'origin/master'	2015-07-25 13:06:23 +01:00
William Burns	91d0a37d77	Animation change etc.	2015-07-25 12:48:39 +01:00
Mini-Chiss	d64d713a87	Merge branch 'Myst_LOBBERS'	2015-07-25 10:50:55 +02:00
Mini-Chiss	9fa8c6ac45	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java	2015-07-25 10:48:06 +02:00
Jonathan Williams	6d367e3cee	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-25 01:38:54 -07:00
Jonathan Williams	d3fede790a	Merge pull request #17 in MIN/mineplex from MinorTweaks to master ... * commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a': Fixed report link http://pastebin.com/BRhT7pZP Reverted things Reverted Trainee to Helper due to popular demand. LOTS of tweaks :D Cleaned up somethings (lib's request) I'm a dumbass Fixed a few achievements Changed mineplex.com/supporthub > mineplex.com/reports	2015-07-25 03:37:28 -05:00
Jonathan Williams	a1ce1ed45d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-25 01:31:01 -07:00
Mysticate	ae5c74680c	SMALL CHANGE OMG DON'T MERGE WITH MASTER YET PELASE	2015-07-25 04:30:56 -04:00
Jonathan Williams	84be48f264	Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method. ... Added conversion of stats to new stat table via StatHandler. Changed stats value from int to long.	2015-07-25 01:30:50 -07:00
Mini-Chiss	59d14624c0	Merge branch 'Myst_LOBBERS'	2015-07-25 10:26:47 +02:00
Mysticate	d295cead09	Final stuff	2015-07-25 04:18:18 -04:00
Mysticate	a002da4c0f	Redid how lobbers works	2015-07-25 03:21:56 -04:00
Mysticate	5d87d9e1e4	.	2015-07-25 02:01:55 -04:00
William Burns	c1e5c2a9dc	MPS changed requested by <insert meow here>.	2015-07-24 21:15:19 +01:00
William Burns	956d685549	Added MPS Game Voting.	2015-07-24 20:24:21 +01:00
Ty Sayers	13f47ad903	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java	2015-07-24 13:59:01 -05:00
William Burns	13fa6bca8b	Make it go back to game choose page.	2015-07-24 16:24:17 +01:00
William Burns	dcb6e0ec59	Added rejected games and whitelist to MPS.	2015-07-24 16:03:53 +01:00
Sarah	a50455acf5	Fising last character bug.	2015-07-24 15:44:36 +02:00
Sarah	c3742ec794	Fixing the too long String bug.	2015-07-24 15:00:49 +02:00
Sarah	609199a6b8	Improving Team names in Team games.	2015-07-24 13:14:41 +02:00
Mysticate	7205065a56	Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_KITS	2015-07-23 17:47:33 -04:00
Mysticate	9a3c4f3a00	Added Ninja Kit to OITQ. New Achievement kit.	2015-07-23 17:46:10 -04:00
Mysticate	365968f41d	Added a bomb token thing	2015-07-23 16:26:43 -04:00
Mysticate	335eb5eacd	Fixed report link	2015-07-23 13:35:06 -04:00
Mysticate	06d4de16cf	Changed particle methods	2015-07-23 13:34:11 -04:00
William Burns	5deb699b02	Added rejected games and whitelist to MPS.	2015-07-23 18:24:41 +01:00
Mini-Chiss	71148ef387	gave twitch same perms as youtubers	2015-07-23 16:29:42 +02:00
Mysticate	91db076053	Fixed lobbers icon in stats	2015-07-23 09:28:35 -04:00
William Burns	68b04574b6	Merge remote-tracking branch 'origin/master'	2015-07-23 13:04:19 +01:00
Sarah	de1ed4ca59	Improving the Event System with ShinyRukii's requests.	2015-07-23 12:06:40 +02:00
Ben Sihota	fe80ed373a	Fix numerous trello bugs ... - Stacker as Block morph - Punish mistake - Achievement mistake - Stacking a chest opener	2015-07-22 22:28:44 -07:00
Mysticate	e4ecc9e858	http://pastebin.com/BRhT7pZP	2015-07-22 23:31:07 -04:00
Mysticate	e638674444	Fixed fuse on detonator	2015-07-22 20:17:19 -04:00
Ben Sihota	a2f6a8cbd3	Merge remote-tracking branch 'origin/master'	2015-07-22 15:38:55 -07:00
Mysticate	b9762bddc4	Fixes	2015-07-22 16:50:57 -04:00
libraryaddict	eff71c3e17	Champions: Add Morten G's changes to fix BlockToss	2015-07-22 08:10:57 +12:00
Mysticate	b4df9f47c5	Added a mortar kit ;o (Please don't fire me b2)	2015-07-21 11:01:45 -04:00
Ty Sayers	0b49d053fe	Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events.	2015-07-20 15:57:57 -05:00
Mysticate	d38fc1a603	Reverted things	2015-07-20 16:40:37 -04:00
Mysticate	e55ca81d48	Reverted Trainee to Helper due to popular demand.	2015-07-20 15:45:16 -04:00
libraryaddict	cd55eba2be	Clans: Fix map inventory moving	2015-07-21 07:37:08 +12:00
Morten	b239f0af28	Fixed some bugs with the Editor kit	2015-07-20 20:40:43 +02:00
Mysticate	6addf00037	LOTS of tweaks :D	2015-07-20 14:27:10 -04:00
Mysticate	63df369700	Cleaned up somethings (lib's request)	2015-07-20 10:18:50 -04:00
Mysticate	bb769aa0f4	I'm a dumbass	2015-07-20 10:02:50 -04:00
Jonathan Williams	0772f2e91e	Fixes for GoldManager	2015-07-19 21:04:59 -07:00
Jonathan Williams	3b47b01aea	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-07-19 20:18:08 -07:00
Mysticate	87cc40fc0c	Fixed a few achievements	2015-07-19 22:38:03 -04:00
Jonathan Williams	73aea85876	GoldManager now uses stored procedure. ... Deductions automatically process gold queue and return if transaction succeeded.	2015-07-19 19:32:46 -07:00
Jonathan Williams	3660b348cd	Work on Gold.	2015-07-19 18:15:50 -07:00
Mysticate	8b2b4c2826	Added to MPS	2015-07-19 15:51:34 -04:00
Mysticate	6edc923002	Changed mineplex.com/supporthub > mineplex.com/reports	2015-07-19 15:43:13 -04:00
Morten	c5f7c4fe0e	Finalized after QA testing. Pretty much ready to go	2015-07-19 19:50:53 +02:00
Ben Sihota	05c18e6a83	Merge remote-tracking branch 'origin/master'	2015-07-18 19:07:11 -07:00
Shaun Bennett	d94f4f96a7	Observer mode changes	2015-07-18 16:40:50 -05:00
Morten	2cad6223a7	Ubs.. Forgot to actually upload the new kits.. :D	2015-07-18 15:15:53 +02:00
Morten	b986cf968e	Added new kits, Changed Compass feature, Fixed a lot of bugs	2015-07-18 15:10:03 +02:00
Mysticate	2dc2b8792c	Fixes, updates	2015-07-17 17:01:24 -04:00
Shaun Bennett	1ef6fe3ed6	Observer changes	2015-07-17 15:37:33 -05:00
Jonathan Williams	52dd9df834	Motd changes.	2015-07-17 11:39:01 -05:00
Sarah	8b26ffaecd	Improving Team names in SG, SSM and Skywars and disabled friendly fire.	2015-07-17 14:05:27 +02:00
Cheese	5e05530b1d	spawn near allies!	2015-07-17 21:28:46 +10:00
Cheese	6ed3f93df7	fixed some scoreboard stuff	2015-07-17 16:17:01 +10:00
libraryaddict	3dcf489ea6	Add 'clan' to the clans command	2015-07-17 17:12:44 +12:00
Sarah	b7ad0035bc	Implementing UHC team system to ssm, sg and skywars.	2015-07-17 07:06:49 +02:00
Sarah	5389193cab	Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams	2015-07-17 06:31:10 +02:00
Sarah	02a71bff68	another git fix	2015-07-17 06:30:53 +02:00
Sarah	aaae11d426	Git Fix.	2015-07-17 06:29:32 +02:00
Cheese	44102842c9	added some velocity debug	2015-07-17 13:27:55 +10:00
Cheese	cfb4911c25	added ability for teams will fill before moving onto next team	2015-07-17 12:54:53 +10:00
Cheese	63f6adf295	fixed spawn picking	2015-07-17 12:50:34 +10:00
Cheese	3335a7c288	changed skywars teams. forced at 16 teams.	2015-07-17 12:07:09 +10:00
Cheese	558b71f866	fixed thigny	2015-07-17 11:48:14 +10:00
Shaun Bennett	096491f15d	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-07-16 15:51:29 -05:00
Shaun Bennett	2b2e5e5c97	Spelling fixes + Observer mode	2015-07-16 15:51:21 -05:00
libraryaddict	c79117f86a	Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events	2015-07-17 00:30:54 +12:00
libraryaddict	aaee5f01ce	Clans: Modifications to map stuff, fix food level depleting too fast	2015-07-17 00:30:34 +12:00
Jonathan Williams	9cf4ff005a	Added some debug checks.	2015-07-16 01:26:38 -05:00
Cheese	917839af0e	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-07-16 12:48:10 +10:00
Cheese	ef4a575d28	fixed blocktoss exploits	2015-07-16 12:47:39 +10:00
Shaun Bennett	6a598690b0	Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix	2015-07-15 21:43:35 -05:00
Morten	d46ac59e10	Added project start	2015-07-16 01:34:57 +02:00
fooify	5d820edd41	remove custom level to fix merge conflicts	2015-07-15 14:34:42 -07:00
Shaun Bennett	05b1e03598	Remove BungeeSigns Module?	2015-07-14 21:57:30 -05:00
Shaun Bennett	7f98157890	More work/fixes	2015-07-14 20:38:30 -05:00
Sarah	9eee425792	revert mistake from last commit.	2015-07-14 23:46:56 +02:00
Sarah	e6aec58ece	Updating Map source.	2015-07-14 23:14:56 +02:00
Mysticate	1e1cf6403d	Added achievements	2015-07-14 13:31:41 -04:00
Sarah	3a2011ee6a	Improving Map System: GameTypes can have more mapSources now.	2015-07-14 13:22:59 +02:00
William Burns	d36dd26f42	Added ChestLoot for games. Setup chest filling via ChestLoot for SurvivalGames.	2015-07-14 11:56:13 +01:00
Shaun Bennett	ae71de30db	Fixes and changes	2015-07-14 01:57:53 -05:00
Sarah	2b10aa2cf9	Improving spawn selection in SkywarsTeams.	2015-07-14 08:19:33 +02:00
Sarah	a224e5937d	Merge branch 'EventGameUpdates' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams	2015-07-14 07:11:48 +02:00
Cheese	251e6206af	Merge branch 'SSM2PlayerTeams' of ssh://184.154.0.242:7999/min/Mineplex into SSM2PlayerTeams	2015-07-14 14:02:50 +10:00
Cheese	0315f61038	changed team spawn selection	2015-07-14 14:02:35 +10:00
Sarah	304a51de04	Improving TeamSurvivalGames Scoreboard.	2015-07-14 05:44:58 +02:00
Sarah	e72d612379	Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams.	2015-07-14 05:25:08 +02:00
Shaun Bennett	5c5e7dd4a9	Merge master into clans	2015-07-13 20:42:10 -05:00
Shaun Bennett	231d4bd494	Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events	2015-07-13 20:23:51 -05:00
Cheese	f2cc2a2c86	youtubers wont get kicked by mac	2015-07-14 10:16:42 +10:00
Shaun Bennett	dc1fe5fc2c	Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager	2015-07-13 19:11:17 -05:00
Cheese	cb05049c4a	youtubes can turn off vel in hubs	2015-07-14 10:08:41 +10:00
Jonathan Williams	f652ad8448	Removing ancient projects that are no longer used.	2015-07-13 13:41:57 -05:00
Mysticate	df60659786	Core edits	2015-07-13 12:14:25 -04:00
libraryaddict	66bef4ac00	Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans	2015-07-13 21:21:17 +12:00
Ben Sihota	b1b8fa59f7	Update IntelliJ builds	2015-07-12 21:11:39 -07:00
Mysticate	616c444c16	Added some things and stuff	2015-07-12 18:15:33 -04:00
Mysticate	0a09ae29f3	Merge remote-tracking branch 'origin/master' into BombLobbers	2015-07-12 18:14:25 -04:00
Sarah	bd3641cdac	Updating TeamSmash with team Generation Methods.	2015-07-12 02:51:18 +02:00
Sarah	be194c5493	Adding Peace Phase Announcement.	2015-07-12 01:00:50 +02:00
Sarah	625f7d3168	Some last small changes.	2015-07-12 00:45:47 +02:00
Sarah	55a1c311bf	Kit improvements and balancing.	2015-07-12 00:21:13 +02:00
Sarah	251accb40a	Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams	2015-07-11 18:49:38 +02:00
Sarah	d41fcb1b7b	Improving the SSM Team Game.	2015-07-11 18:44:33 +02:00
Mysticate	d0180910e9	Added two new kits.	2015-07-11 10:25:04 -04:00
Sarah	64915a0b7d	Implementing Meteoroids for Game end and changing Kit description.	2015-07-11 04:28:37 +02:00
Mysticate	0353b8571d	Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers	2015-07-10 16:41:29 -04:00
Jonathan Williams	96a93b6786	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-10 15:32:25 -05:00
Jonathan Williams	7684e1837d	Added new support staff to whitelist.	2015-07-10 15:31:38 -05:00
Mysticate	f812fd0530	Please push please	2015-07-10 16:31:37 -04:00
Sarah	5429e3eb76	snowfight kits	2015-07-10 13:17:07 +02:00
Sarah	152523fc3d	snowfight update	2015-07-10 13:13:38 +02:00
Jonathan Williams	f8b3431305	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-09 11:08:22 -05:00
Jonathan Williams	a20a9ba9e7	Fixed issue and updated bungee motd manager.	2015-07-09 11:07:43 -05:00
Jonathan Williams	77a63f72cc	Updated staff server white list.	2015-07-09 11:07:16 -05:00
Jonathan Williams	ecd8e3d7b0	Increased wait time for redis.	2015-07-09 11:07:00 -05:00
Mysticate	9e07be51c7	Bug fixes	2015-07-09 12:03:56 -04:00
Mysticate	1b3d7f1c20	Fixed and added things	2015-07-08 23:57:48 -04:00
Cheese	49daf597b5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-09 12:47:57 +10:00
Cheese	7d073fdc0d	fixed skywars icon ... changed LOSSES to GAMESPLAYED for consistency	2015-07-09 12:47:40 +10:00
Shaun Bennett	a9e68ff777	Completed Energy	2015-07-08 21:39:31 -05:00
Sarah	068b7bdd47	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-07-09 03:48:44 +02:00
Sarah	5babd8a41a	Fix number formatting for different system locale	2015-07-09 03:45:57 +02:00
William Burns	3ba7ba259c	Added map selection to MPS.	2015-07-08 15:24:16 +01:00
fooify	5d34716521	squirrel!	2015-07-08 06:20:40 -07:00
William Burns	e819a4dab3	Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps	2015-07-08 09:56:39 +01:00
William Burns	6008e58c12	Added map selection to MPS.	2015-07-08 09:49:41 +01:00
libraryaddict	7e3fdef2e8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-07-08 18:43:56 +12:00
libraryaddict	1f250bf951	MineWare: Add current progress	2015-07-08 18:43:37 +12:00
Ben Sihota	ca880371a6	Merge remote-tracking branch 'origin/master'	2015-07-07 21:19:43 -07:00
Cheese	480a29b874	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-08 13:55:16 +10:00
Cheese	e36b0440a4	Merge branch 'bench' ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java Plugins/Mineplex.StaffServer/.classpath	2015-07-08 13:55:01 +10:00
Ben Sihota	ffbee4a9aa	Add more details to /game ... Fix NPE with /game set	2015-07-07 18:20:27 -07:00
libraryaddict	9eff5b7245	Perks: Forgot to include this in last commit, no harm done.	2015-07-08 07:51:33 +12:00
fooify	8149d61343	Merge remote-tracking branch 'origin/master' into foo	2015-07-07 07:59:46 -07:00
Jonathan Williams	7bf440f786	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-07 05:18:15 -04:00
libraryaddict	2bec753a34	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-07-07 12:30:37 +12:00
libraryaddict	bff3897fab	Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered.	2015-07-07 12:30:20 +12:00
Shaun Bennett	6c8c3946a3	Revert "Add IntelliJ IDE library files" ... This reverts commit 71d696278d.	2015-07-06 17:06:29 -05:00
Ben Sihota	71d696278d	Add IntelliJ IDE library files	2015-07-06 13:48:47 -07:00
Cheese	cca26165cd	swapped sale back to 50%	2015-07-06 11:42:54 +10:00
libraryaddict	2c249e37b5	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-07-06 07:07:56 +12:00
libraryaddict	e16cb4cef7	Disguise: Initite armorstand vector	2015-07-06 07:07:41 +12:00
libraryaddict	3d0dda382b	Stacker: Fixed an infinite loop	2015-07-06 07:07:19 +12:00
Shaun Bennett	abaa0ddee8	Level for Bobby	2015-07-05 13:30:16 -05:00
Cheese	7182205fde	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-07-05 15:13:33 +10:00
Cheese	8d2b1650af	world component for MCPE	2015-07-05 15:13:18 +10:00
libraryaddict	e002e4af18	Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises	2015-07-05 13:37:07 +12:00
libraryaddict	abbf6957b0	Update craftbukkit to fix maps and cursors in 1.8	2015-07-04 09:08:08 +12:00
libraryaddict	27c7e7be03	Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events	2015-07-04 09:07:29 +12:00
libraryaddict	fbf2935b19	Don't display dead players	2015-07-04 09:07:14 +12:00
Shaun Bennett	384d1814d7	Scoreboard teams display clan relationships	2015-07-03 15:12:46 -05:00
libraryaddict	c021c6cc19	Added missing but not forgotten MapCommand	2015-07-04 07:12:50 +12:00
libraryaddict	24294237ea	Add /map command	2015-07-04 04:11:35 +12:00
libraryaddict	89a4541275	If inventory is empty, add clans map	2015-07-04 04:09:18 +12:00
libraryaddict	c75f22b5e0	Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2015-07-04 03:44:59 +12:00
Jonathan Williams	cf035eeb37	Fixed Bungee issues with new redis configs.	2015-07-03 02:17:27 -04:00
libraryaddict	68f7bd533d	Clans Map stuff	2015-07-03 14:23:37 +12:00
Cheese	556e524e18	changed notifications back to 75% sale	2015-07-02 16:14:47 +10:00
Cheese	1e26ebe0bd	disabled ice forming	2015-07-02 10:09:39 +10:00
fooify	70d351adae	fix getting snowballs from bedrock	2015-07-01 16:58:16 -07:00
Cheese	0100ca1b8c	fixed a derp bug	2015-07-02 09:41:33 +10:00
fooify	e7b51ac1c1	add jnr_dev to updaterank	2015-07-01 16:40:15 -07:00
fooify	d1e4306684	fix this agaaaaain	2015-07-01 16:38:10 -07:00
fooify	04c863c0eb	FOOIFY IS A NOOB OKAY	2015-07-01 16:10:41 -07:00
fooify	4495468c7f	fix concurrentmodificationexception	2015-07-01 15:50:07 -07:00
fooify	8574c0bdeb	fix turfforts bug	2015-07-01 09:58:45 -07:00
fooify	b7476cec5e	prevent STATIONARY_LAVA from breaking in creeper smash	2015-07-01 08:25:17 -07:00
fooify	6dc7384c82	fix creeper smash exploding lava and bedrock	2015-07-01 08:16:14 -07:00
fooify	6d42be4d13	fix spleef lava issue	2015-07-01 07:17:41 -07:00
Cheese	dd9fc8e7c6	bridge speed increase	2015-07-01 15:14:46 +10:00
Cheese	0650b73374	more bridge tweaks	2015-07-01 14:16:56 +10:00
Shaun Bennett	9ccc85a79e	Improved block restore for Events	2015-06-30 22:30:49 -05:00
Cheese	190e58c37e	bridges update	2015-07-01 12:58:54 +10:00
fooify	b9b9c5f801	ishh also wanted this :P (let me know if I should remove it)	2015-06-30 13:37:46 -07:00
fooify	c824a39058	ishh wanted it...k	2015-06-30 13:33:41 -07:00
Shaun Bennett	0fce46f504	Finished Undead Camp Event (Loot tables still need adjusting)	2015-06-30 15:28:50 -05:00
Shaun Bennett	0fdc4e0008	Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/event/undead/UndeadCamp.java	2015-06-30 14:04:35 -05:00
Shaun Bennett	be974bfaac	Work from laptop	2015-06-30 14:02:39 -05:00
fooify	a72eee9cf3	Merge remote-tracking branch 'origin/master' into foo	2015-06-30 09:20:43 -07:00
fooify	d2cc8d5077	fix grammar bug	2015-06-30 09:19:21 -07:00
fooify	11fb02a594	add stained glass to list of blocks that can be broken in quiver	2015-06-30 09:03:43 -07:00
Cheese	de36e3d8e4	added WATER_DAMAGE support for maps ... modified some bridges code	2015-07-01 00:18:06 +10:00
Jonathan Williams	c6e4c5c5e4	Fixed mineplexer server status link. ... Fixed issue with ServerManager and default connection.	2015-06-30 03:49:53 -04:00
Shaun Bennett	e0284e2eb0	Loot for World Events	2015-06-29 22:32:40 -05:00
Cheese	e3d060376b	disabled double gem	2015-06-30 13:10:08 +10:00
Ty Sayers	cd4bebbeee	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-06-29 19:27:23 -04:00
Ty Sayers	1992205393	Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up.	2015-06-29 19:27:05 -04:00
Jonathan Williams	2069524f15	Merge remote-tracking branch 'remotes/origin/foo'	2015-06-29 18:14:07 -04:00
Jonathan Williams	bbb661d686	Fixed up BenefitManager.	2015-06-29 18:07:06 -04:00
Ty Sayers	d2f633f572	Fix attribute name positioning bug as well as duplicated attributes on randomly generated items. Fix misleading description of item attributes Conquering/Protection. Fix bug with unwanted entities spawning and targetting players in safe Spawn zones. Fix bug with WindBlade occasionally killing users via fall damage after a long flight even though close to the ground. Fix bug with MagneticBlade not properly pulling entities other than players. Fix bug with AlligatorsTooth not properly granting certain effects such as water breathing.	2015-06-29 16:38:51 -04:00
fooify	4ff456b722	Merge remote-tracking branch 'origin/master' into foo	2015-06-29 11:29:22 -07:00
Jonathan Williams	d426c24970	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-29 06:14:30 -04:00
Cheese	da3c5eeaaf	40k b enefit	2015-06-29 20:14:15 +10:00
Jonathan Williams	9f384b0d3e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-29 06:02:57 -04:00
Cheese	48f5fa118a	fixed a few sky bugs	2015-06-29 14:26:00 +10:00
Cheese	2963f7a61c	stacker wont give too many msgs	2015-06-29 10:13:33 +10:00
Cheese	b0f8369bcd	lowered block falling speed. ... fixed a bug where some chests didnt fall	2015-06-29 10:09:36 +10:00
Cheese	0ea388379a	reduced win req for skywars ach ... enabled beenfit for 40k reward	2015-06-28 15:16:05 +10:00
Cheese	ead402d026	skywars art	2015-06-28 14:31:25 +10:00
Shaun Bennett	d07c319581	Saving some work	2015-06-27 22:22:02 -05:00
Cheese	08e4ef199e	added twitch to dguisecmd	2015-06-28 12:53:18 +10:00
Cheese	faca14dd23	fixed disguise permission	2015-06-28 12:50:27 +10:00
Cheese	840ebabf2a	added delay on mad scientist eggSpawn ... fixed Exp bug	2015-06-27 20:39:05 +10:00
Jonathan Williams	65a10461cd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java	2015-06-27 02:29:07 -05:00
Jonathan Williams	9a4bcd29a1	Fixed Sparks problems...	2015-06-27 02:26:29 -05:00
Cheese	1f34bc40a3	increased time you can hold TNT for in CS	2015-06-27 14:08:16 +10:00
Cheese	4c164ce2a6	enabled double gems	2015-06-27 12:44:43 +10:00
Cheese	d0368a19d8	Players who quit early do not get full game worth of EXP.	2015-06-27 12:38:04 +10:00
Cheese	754026f403	chicken teleport fix ... scientist minion name fix	2015-06-27 12:18:12 +10:00
Cheese	4183d6f21d	some balance	2015-06-27 11:40:40 +10:00
Cheese	270a2e4107	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-27 11:24:33 +10:00
Cheese	4e06a1aae3	fixed a few skywars bugs ... improved warning for bridges	2015-06-27 11:24:01 +10:00
fooify	4b634d1bc3	Fix slashes (this won't affect windows users, right?)	2015-06-26 10:14:37 -07:00
fooify	333c54cff9	Merge branch 'master' into foo	2015-06-26 10:07:13 -07:00
Shaun Bennett	8ef52ea103	Mineplex Gold Rush 2.0	2015-06-26 10:50:37 -05:00
Cheese	9a0ac821a2	fixed stat bug	2015-06-26 19:44:13 +10:00
Cheese	c0bc522614	split achievement text over 2 lines	2015-06-26 19:32:18 +10:00
Cheese	750769d03a	fixed gem thing	2015-06-26 19:12:34 +10:00
Cheese	62a7fd6a99	you now get levels for kills/assists ... fixed scoreboard bug	2015-06-26 19:12:11 +10:00
Cheese	b0019242e7	skywars scoreboard fix	2015-06-26 19:02:34 +10:00
Jonathan Williams	8c427bee24	Fix _gameDisplay bug. ... Fix Skywars quickmenu link.	2015-06-26 03:57:39 -05:00
Jonathan Williams	8f2c0cf9d8	Fix file names.	2015-06-26 03:15:16 -05:00
Jonathan Williams	62cfa215b2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-26 03:12:09 -05:00
Jonathan Williams	c1ef96bdcd	Fixed jre for staff server	2015-06-26 03:12:00 -05:00
Shaun Bennett	c158a6f89f	Merge remote-tracking branch 'origin/master'	2015-06-26 03:10:53 -05:00
Shaun Bennett	3b6a692a2a	Ooops	2015-06-26 03:10:44 -05:00
Cheese	1aa0832bb9	SkyWars to Skywars	2015-06-26 17:55:49 +10:00
Cheese	9bf58a2d98	disabled pistons	2015-06-26 17:47:04 +10:00
Cheese	1564a8bc51	disabled hoppers	2015-06-26 17:46:05 +10:00
Cheese	17af562f19	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-26 17:36:25 +10:00
Cheese	59f730ae9d	changed sky text and icon to feather	2015-06-26 17:36:12 +10:00
Jonathan Williams	f906f08a18	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-26 02:34:36 -05:00
Shaun Bennett	2657ef336a	Merge remote-tracking branch 'origin/master'	2015-06-26 02:33:00 -05:00
Shaun Bennett	60901cc17e	Merge remote-tracking branch 'origin/master' ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java	2015-06-26 02:32:51 -05:00
Cheese	c31d3609bb	soup no longer spawns in stacks	2015-06-26 17:32:46 +10:00
Shaun Bennett	7c698f65cf	Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads	2015-06-26 02:31:35 -05:00
Jonathan Williams	c78ef9d93d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-26 02:30:01 -05:00
Cheese	a5aa2bc0e9	text changes	2015-06-26 17:28:23 +10:00
Cheese	2498f7756c	skyawrs stats icon	2015-06-26 17:16:16 +10:00
Cheese	c514cacd5d	more skywars fixes	2015-06-26 17:05:29 +10:00
Cheese	015ba53bbe	skywars hub text	2015-06-26 16:39:25 +10:00
Cheese	027efe02fc	skywars!	2015-06-26 16:38:44 +10:00
Jonathan Williams	efa06d370b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-26 01:13:42 -05:00
Jonathan Williams	86e2514e37	Fixed callbacks for gem/coin rewards.	2015-06-26 01:13:28 -05:00
Cheese	257c088948	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-26 16:08:17 +10:00
Cheese	b744320ecc	pearl trail fix	2015-06-26 16:08:04 +10:00
Shaun Bennett	1865e41144	Undead Camp	2015-06-26 01:05:36 -05:00
Cheese	caa51d0e89	Merge branch 'SkyWars'	2015-06-26 16:04:46 +10:00
Cheese	16af8453e3	pearl fix	2015-06-26 16:04:07 +10:00
Cheese	338797f4a6	skywars update	2015-06-26 15:57:47 +10:00
Cheese	aef8a00017	update!	2015-06-26 15:25:43 +10:00
Cheese	8f3d0ad84b	fixed some bugs :O	2015-06-26 14:38:39 +10:00
Cheese	0874178973	skywars update!	2015-06-26 14:14:22 +10:00
Cheese	2d1d65b239	skywars fixes	2015-06-26 13:15:03 +10:00
fooify	7f7edddf42	Fix TNT bug in SG - tested, works fine! :)	2015-06-25 19:36:31 -07:00
Cheese	5710831777	fixed webs dropping webs	2015-06-26 12:34:26 +10:00
Cheese	7d4e36651f	less random chests	2015-06-26 12:26:57 +10:00
Cheese	fdbaa4e9c7	dont allow overfill	2015-06-26 12:18:25 +10:00
Cheese	f1da68a82a	fixed chickens not spawning	2015-06-26 12:14:35 +10:00
Cheese	00da27a3d6	added middle chests ... added chicken spawns added zombie/chicken loot	2015-06-26 12:06:40 +10:00
Cheese	beb78270e5	skywars loot changes	2015-06-26 11:54:35 +10:00
Cheese	bb569a26e2	skywars update	2015-06-26 11:22:33 +10:00
Cheese	b48820a753	ore gen fixed!	2015-06-26 10:50:38 +10:00
Cheese	d9a8d2b6ab	ore changes	2015-06-26 10:36:45 +10:00
Jeremiah Bishop	0342a5ac61	Fixed Achievements ... Reordered Kits Added new Kit etc, etc, etc...	2015-06-25 19:03:25 -04:00
fooify	2679d19a81	Missed a spot.	2015-06-25 08:19:12 -07:00
fooify	ba9e4ba5d9	Fix staff server not hiding in friends list	2015-06-25 08:17:28 -07:00
Cheese	2179795677	Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java	2015-06-25 20:48:34 +10:00
Cheese	2bf1faa70d	fixed a few skywars bugs ... added ore generation (but theres some wierd bug, still working on it)	2015-06-25 20:24:31 +10:00
Jonathan Williams	526b0dadb6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-25 04:58:26 -05:00
Jonathan Williams	567bb5cd6c	Fixed up MotdManager so that old values don't overwrite in the db.	2015-06-25 04:58:16 -05:00
Jonathan Williams	5bdb90b459	Changed disguise perm to YOUTUBE	2015-06-25 04:57:56 -05:00
Shaun Bennett	7f530f6593	New border dimensions	2015-06-24 23:18:18 -05:00
Shaun Bennett	a0d97d5d99	Scoreboard changes, Fix region values, add 1.8 Border for map	2015-06-24 22:44:41 -05:00
Jeremiah Bishop	ed667fedee	Added more achievements	2015-06-24 22:59:28 -04:00
Cheese	b77279a160	fixed notif msg	2015-06-25 11:22:23 +10:00
Jeremiah Bishop	cd10a2ad79	Fixed both kits ... Added game achievements.	2015-06-24 20:08:31 -04:00
fooify	a36af0acc4	Remove space :) I assume this isn't intended	2015-06-24 10:28:39 -07:00
fooify	ea3c04b8c1	Add fooify to list of AFKers	2015-06-24 10:24:08 -07:00
Shaun Bennett	2735c81205	Fix bug with leaving and joining clans: online player list wouldnt update	2015-06-23 23:00:07 -05:00
Shaun Bennett	fa612c9c86	Chat filter clan names, Fix scoreboard bug	2015-06-23 22:48:51 -05:00
Shaun Bennett	935aba9c16	Some world event tweaks, refactor clans and clanTerritory to use new clanServer table with serverId, updated jooq classes	2015-06-23 21:45:55 -05:00
Shaun Bennett	e34324b864	Disable auto event now while location and abilities are tweaked	2015-06-23 17:05:47 -05:00
Shaun Bennett	76a1f2b1f0	Reset timer when no players are online	2015-06-23 16:37:49 -05:00
Shaun Bennett	009f8a6764	Merge with twiggy	2015-06-23 16:36:21 -05:00
Jeremiah Bishop	5b4a3249ca	Added chest loot and such.	2015-06-22 21:42:45 -04:00
Jeremiah Bishop	7583e4170b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars	2015-06-22 21:40:43 -04:00
Shaun Bennett	50ddd23251	Event auto starting, Terrain Finder, Scoreboard Tweaks, Event idle, other random tweaks	2015-06-22 20:34:13 -05:00
Ty Sayers	1541dc329e	Merge branch 'clans/test-server' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java	2015-06-22 16:24:31 -04:00
Ty Sayers	2ffe2badf2	Reimplement clan energy-draining over time. Add combat-logging NPC for players that prematurely log off. Fix bug regarding /logout command for safe-logging. Reduce Shop territory side by 1 chunk radius. Add organic farming shop for purchasing/selling farm produce. Add travel hub for transporting between different spawn and shop locations. Add missing BowAttributes implementations for custom bows, and re-add in probability for dropping bows on custom gear drops. Fix bug related to custom-bow items not properly formatting item descriptions and display name. Update Redis default host IP. Fix bug where ranged attacks triggered melee-based custom gear attributes. Add clan management command for managing/deleting clans during testing phase of alpha/beta Clans.	2015-06-22 16:20:20 -04:00
Cheese	3a06b54b7f	Changed notifications to 50% off sale	2015-06-22 17:10:03 +10:00
Jeremiah Bishop	03c45116ef	Various fixes, and added the new data to Zoologist kit	2015-06-21 23:38:25 -04:00
Cheese	648355ac17	mapparser skywars	2015-06-22 11:33:25 +10:00
Jeremiah Bishop	a05c2d085d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars	2015-06-21 16:17:51 -04:00
Jeremiah Bishop	e12ff7ef7d	Fixed?	2015-06-20 22:20:30 -04:00
Jeremiah Bishop	3cf1297d89	Added SkyWars ;)	2015-06-20 22:08:15 -04:00
Aaron Brock	5280433dbd	Added the Pair class for simple 2 object storing, and added upperCaseCount and lowerCaseCount to UtilText. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-20 10:03:53 -04:00
Aaron Brock	3532dea892	Allowed Helper+ to bypass anti-hackusating ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-20 10:01:50 -04:00
Jonathan Williams	91b5beaff2	Fixed new Chat constructor requirement.	2015-06-20 03:43:38 -05:00
Jonathan Williams	90e13b4b9e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-20 03:37:33 -05:00
Jonathan Williams	f92e864c30	Updated motd.	2015-06-20 03:37:22 -05:00
Jonathan Williams	dbde6890a0	Add fallback to load by name if no uuid.	2015-06-20 03:36:55 -05:00
Aaron Brock	8ea23f96fc	Froze time using doDayNightCycle instead of setting the time on UpdateEvent. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-20 01:36:05 -04:00
Aaron Brock	da981980df	Added world.setThundering(false); ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-20 01:35:11 -04:00
Aaron Brock	9cedb3b742	Rewrote how hackusations are detected. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-20 01:10:26 -04:00
Aaron Brock	1f0accd2a1	Fixed a little boolean derp that stopped people from breaking blocks. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-20 01:09:21 -04:00
Cheese	478a3c8591	some champs fixes/balance ... duplicate message improvement	2015-06-20 15:00:16 +10:00
Cheese	77bf332c29	level 25 is uneffected by chat delay	2015-06-20 11:18:31 +10:00
Cheese	2c43dc76c9	DMT no longer effected by 3s chat delay ... Minestrike no longer has 'terrorists' Jr.Dev rank up!	2015-06-20 11:12:24 +10:00
Aaron Brock	750dddeabc	Editing .classpath and a main testing method in UtilBlock ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-19 21:10:10 -04:00
Aaron Brock	61494f93ba	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench	2015-06-19 18:13:48 -04:00
Cheese	13ae7a19db	jr.dev rank up	2015-06-19 18:06:40 +10:00
Cheese	cf152c4897	fixed notifs being sent to people who didnt need them	2015-06-19 13:46:56 +10:00
Cheese	de83e58e75	removed debug	2015-06-19 13:29:32 +10:00
Cheese	8a224950b3	Added sale notifications ... Added 3s chat delay	2015-06-19 13:27:59 +10:00
Aaron Brock	76e4dc6056	Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-18 19:50:06 -04:00
Jeremiah Bishop	dd9e6a6866	Started adding SkyWars game mechanics	2015-06-18 14:54:26 -04:00
Shaun Bennett	71da87a5ae	Some cleanup	2015-06-17 21:36:47 -05:00
Cheese	9a3a014dd5	removed debug!	2015-06-18 12:04:49 +10:00
Shaun Bennett	b5f4574b1b	Show region on scoreboard, moving on to event finishes	2015-06-17 20:37:45 -05:00
Aaron Brock	b0ca5ca4aa	Freezes the time using doDayLightCycle instead of using a UpdateEvent. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-17 20:54:28 -04:00
Aaron Brock	41e77b1ade	Fixed double-half-slabs (line 68) ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-06-17 20:49:35 -04:00
Shaun Bennett	dbdb2b3fc5	Scoreboards and WorldEvent work	2015-06-17 17:40:16 -05:00
Cheese	6886484d79	Fixed Micro Battles lag (stupid lava) ... cmds for jnr devs smaller head hitbox in MS added MB to parser plugin	2015-06-17 13:02:12 +10:00
Cheese	47744a80e9	jnr dev	2015-06-17 10:44:29 +10:00
Cheese	3014521e79	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-17 10:43:01 +10:00
Cheese	c8843aa2b2	jnr dev rank	2015-06-17 10:42:20 +10:00
Jonathan Williams	0d12a2c12d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-16 12:43:04 -05:00
libraryaddict	b0c026e67c	Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn	2015-06-16 14:01:52 +12:00
Jonathan Williams	88328148d1	Modified hardcoded IPs for Bungee player counts. ... Added Jr Dev rank.	2015-06-15 12:52:59 -05:00
Shaun Bennett	8245b6c466	Schematic generation over time, fixes to gold manager drops	2015-06-14 17:30:02 -05:00
Jonathan Williams	47099a0b20	Changed default redis ip to new us redis. ... Changed previous server to gold text when sending to new server.	2015-06-12 15:45:54 -05:00
Shaun Bennett	d24f01ba86	More event stuff!	2015-06-11 23:35:29 -05:00
Cheese	a141cec104	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-11 08:57:04 +10:00
Cheese	390ffcab6d	bridges support for lillypads map	2015-06-11 08:56:32 +10:00
Shaun Bennett	9cdf69b19d	More work on events	2015-06-09 22:58:52 -05:00
Ty Sayers	4dd1cf43de	Add ability to convert Gems into Gold daily to Bank Shop, including redis-based system for tracking most recent transfers. Fix bug with item attributes that reference potions not properly displaying potion value effects (uses roman numerals). Prepare for custom textured Legendary items by modifying over to record-based materials. Add base for organic produce / farming shop.	2015-06-09 15:46:38 -04:00
Jonathan Williams	f0ce43ca5a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-09 13:22:45 -05:00
Shaun Bennett	a20f41be09	Merge remote-tracking branch 'origin/master'	2015-06-09 13:21:26 -05:00
Shaun Bennett	3f9010fb7a	Fix GameScore comparator	2015-06-09 13:21:15 -05:00
libraryaddict	37c6593753	Hub: Fix rulebook	2015-06-10 05:27:19 +12:00
libraryaddict	2971761a5e	Game stop command: Move unregister of game listener after the gamestate has been changed	2015-06-09 22:19:03 +12:00
Jonathan Williams	c6352445cf	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-06-08 23:18:06 -05:00
Shaun Bennett	d1a7d16810	Fixes GoldManager	2015-06-08 15:04:30 -05:00
Shaun Bennett	6a0584d419	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans/world-events ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java	2015-06-08 15:03:51 -05:00
Shaun Bennett	aa9aba92cd	Commit for merge	2015-06-08 14:59:06 -05:00
libraryaddict	1f08c989b5	Minestrike: Enforce resource pack	2015-06-09 03:31:24 +12:00
Shaun Bennett	8c7faf27dd	Store gold drop amounts in item metadata (might be worth switching to our own storage?)	2015-06-06 16:04:11 -05:00
Shaun Bennett	ed1c275347	Add Nautilus.Game.PvP to IntelliJ	2015-06-06 15:48:29 -05:00
Shaun Bennett	24a1016836	Slime enrage	2015-06-06 15:39:51 -05:00
Shaun Bennett	6ea000fd22	Remove slimes when server stops	2015-06-06 15:16:03 -05:00
Shaun Bennett	b2bdfe384b	Fix IllegalArgumentException with UtilPlayer method	2015-06-06 15:02:16 -05:00
Shaun Bennett	1f92564ea1	Changes to Slime Boss, ability to drop gold with GoldManager, small KOTH changes. [ALL UNTESTED]	2015-06-06 14:49:41 -05:00
libraryaddict	8cf10afb1b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-06-06 18:31:08 +12:00
libraryaddict	fd3232f45d	Mineware: Rename old MineWare and move packages	2015-06-06 18:30:47 +12:00
libraryaddict	ef9c69f356	UtilShapes: Fix a method, add a space in OldMineWare in GameType	2015-06-06 18:08:37 +12:00
libraryaddict	5f2810ae37	SurvivalGames: Fix anyone able to start game	2015-06-06 18:07:55 +12:00
Ty Sayers	971612a538	Fix bug relating to Energy Shop purchases and item functionality. Fix bug with GoldManager not being properly initialized on plugin start-up. Add Shops safe-zone to region claims for default clans across world. Create BankShop for all interactions related to economy management, specifically buying & selling GoldTokens as well as converting Gems into Gold on a daily basis.	2015-06-05 19:18:06 -04:00
Cheese	f9b49caeed	More gems for bridges/sg kills ... Changed Al'Jaha MS name to Bombers Added Reporting functionality to Builders Nerfed Iron Hook Allowed longer AFk during games	2015-06-05 12:21:20 +10:00
Shaun Bennett	90a7362440	Marge with twiggys code, work on slime splitting	2015-06-04 00:21:09 -05:00
libraryaddict	3a6c030f01	ConditionManager: Use a scheduler if the potion effect is being removed due to potion effect's doing something	2015-06-04 16:01:52 +12:00
Ty Sayers	fa3e6c3d1f	Fix bug with multiple locations being used for claiming separate areas for server-side clans such as Spawn.	2015-06-03 20:10:32 -04:00
Ty Sayers	e15a2ad123	Add ClansRegions to handle the initialization of default server-side Clans representing special territories such as Spawn and Fields. Additionally, claim land with appropriate distribution according to the respective Clan. Fix bug with WeightSet generation not properly handling low amounts of uniformly likely elements. Fix bug with ClanInfo not properly handling creation of clans and initializing the date created field. Fix bug with Spawn region not properly protecting from claim and PvP settings.	2015-06-03 20:08:34 -04:00
Shaun Bennett	d8acb0aae6	Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2015-06-02 20:45:53 -05:00
Shaun Bennett	5d431a586a	King of the hill work	2015-06-02 20:44:14 -05:00
Ty Sayers	1fa919e954	Finish GoldToken integration for cashing in. Re-implement fixed hidden JSON lore encoding. Fix damage reduction attributes where entity types weren't being properly initialized. Prevent players from breaking blocks in temporary Spawn regions.	2015-06-02 20:01:42 -04:00
libraryaddict	a961e5f0d5	Wizards: Don't gain wands from stats page	2015-06-02 18:49:50 +12:00
libraryaddict	4d8a54e7ba	Wizards: Add spellbook on /spec	2015-06-02 18:49:27 +12:00
libraryaddict	bcdb851e21	Teleport: Don't disqualify staff if they are not alive	2015-06-02 18:48:45 +12:00
Ty Sayers	155b078c49	Update spigot version to Shaun's changed. Add separate spawn locations at (200,0) and (-200,0) on the map as well as safe-zone regions surrounding spawns. Temporary halt energy deduction until energy shop is enabled. Fixed issues related to field zones being claimable/breakable, as well as borderlands. Define claimable areas. Add GoldToken item for storing currency into physical items. Add gold management for checking economic status for players.	2015-06-01 15:51:22 -04:00
Ty Sayers	2e19aabfa1	Convert damage system to custom Mineplex damage events to enable legendary abilities. Fix NPE and hanging issue on ServerData's serialization adapter. Finalize item generation logic for instantiating CustomItem's based on specified random distribution of types, attribute counts, etc. Fix several Legendary bugs discovered during testing. Clean left-over template documentation and further clarify ambiguous methods. Add proper updating logic for custom items to track internal stats in hidden json lore. Add safe-logout system to prevent combat logging and enable players to safely log after a designated amount of time. Tweak WindBlade's flight speed to a more natural value.	2015-06-01 12:25:20 -04:00
Shaun Bennett	68b708e32e	Schematic Utilities for Clans	2015-05-29 18:23:46 -05:00
libraryaddict	35c005feb8	Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players	2015-05-30 10:30:30 +12:00
libraryaddict	092447170e	Game Border: Fix typo that offsets border by one block	2015-05-30 10:24:15 +12:00
libraryaddict	ae41f232b0	GameType: Change to reflection for creating game instances	2015-05-30 10:23:46 +12:00
libraryaddict	574dd16022	Hub: Modify rulebook	2015-05-30 10:20:28 +12:00
libraryaddict	6c9963e1b3	CommandCenter: Cancel command event straight after verifying that its been registered	2015-05-30 05:44:49 +12:00
Shaun Bennett	7d43b146b7	[Core] Display Games Played instead of Losses for a bunch of the arcade games where losses will be greater than wins	2015-05-28 19:05:45 -05:00
Shaun Bennett	dc994956e1	[Clans] Slime absorb work	2015-05-28 18:56:03 -05:00
Shaun Bennett	cc1219fd38	[Spigot] Spigot class change for Ty	2015-05-28 15:24:10 -05:00
Shaun Bennett	6b10d9f3c9	[Clans] More work on world events	2015-05-28 15:20:43 -05:00
Jonathan Williams	2c5471cb34	Added ability to see which server you were sent from.	2015-05-28 09:33:49 -05:00
libraryaddict	d84bd4ffe4	Messaging: Now with censors!	2015-05-28 10:13:31 +12:00
Shaun Bennett	a900a2a70a	[Arcade] Another attempt at fixing spectator gui.... :^)	2015-05-26 19:50:01 -05:00
Shaun Bennett	25ba20e411	[Arcade] Fixes for DMT and DT not counting loses properly	2015-05-26 19:28:42 -05:00
Shaun Bennett	0499e1acf1	Merge remote-tracking branch 'origin/master'	2015-05-26 18:55:42 -05:00
libraryaddict	e15e42afae	UHC: Expanded from 32 blocks to 36	2015-05-27 02:40:27 +12:00
libraryaddict	b8cd2aaece	UHC: Expand anti-build protection from 16 blocks to 32	2015-05-26 11:04:27 +12:00
Ty Sayers	167549c9e8	Add implementation for variety of attribute and base attribute hierarchies, add in JSON encoding for itemstack-item pairing to hold stats and information about items without unintuitive print & parse methods. Temporarily disable donation related commands in DonationManager for testing, as it was presenting compilation issues. Introduce further implementation of LegendaryItems. Add various utility methods for JSON encoding (utilizes GSON). Fix various bugs seen in internal testing.	2015-05-25 14:22:06 -04:00
libraryaddict	c53d52ee42	UHC: Disable gadgets	2015-05-24 20:17:39 +12:00
libraryaddict	21aa97b3b9	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-24 20:13:43 +12:00
libraryaddict	63e28e25c9	HoleInTheWall: Push the failed game	2015-05-24 20:10:56 +12:00
libraryaddict	0d0d5eea64	Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1	2015-05-24 20:10:16 +12:00
Shaun Bennett	20fadcd187	[Clans] Work on world events/slime boss	2015-05-24 01:37:16 -05:00
Jonathan Williams	96b1df4ee0	Fixed global player count. ... Fixed tasks.	2015-05-22 14:33:25 -07:00
Shaun Bennett	ff377a3e5c	[Clans] World event state system	2015-05-21 15:33:02 -05:00
Jonathan Williams	303cfd02fa	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-17 23:12:27 -07:00
Jonathan Williams	f0c7f2fe76	Merge branch 'MSSQL_Conversion' ... Conflicts: Website/LOCWebsite.suo	2015-05-17 23:11:50 -07:00
Jonathan Williams	476dd17ffe	Fix for null rank in /c staff server.	2015-05-17 23:11:04 -07:00
Shaun Bennett	c107f4d0d9	[Arcade] Working on private servers	2015-05-17 16:31:09 -05:00
Shaun Bennett	5cd191f582	Merge remote-tracking branch 'origin/master'	2015-05-17 16:29:01 -05:00
Jonathan Williams	375b23db3c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-17 13:46:46 -07:00
Ty Sayers	afb0b1cfdf	Add Charset argument for reading File lines in ServerManager, ideally to prevent compilation issues with other java versions.	2015-05-17 14:50:22 -04:00
Jonathan Williams	e728edb44d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-17 01:29:49 -07:00
Jonathan Williams	47ff9101fd	Finished up changes for game task conversion.	2015-05-17 01:28:44 -07:00
Ty Sayers	e8d5d50162	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-05-16 13:13:53 -04:00
Ty Sayers	672fc99a3e	Add fail-safe default connection in case of issue in proper redis-config.dat generation. Add documentation to clarify purposes related to redis configuration.	2015-05-16 13:12:20 -04:00
Ty Sayers	a8b0dddf17	Add support for redis configuration file to determine viable redis master and slave connections, that can be set to be region-dependant. Fix leakage issue with command manager with not properly returning broken jedis resources. Funnel all redis connection requests through ServerManager for easier configuration use.	2015-05-16 13:01:21 -04:00
Ty Sayers	a8a8d4961a	Add remaining bow and armor based attributes, include base implementation of Legendary weapons. Fix smelting bug.	2015-05-16 12:58:58 -04:00
Shaun Bennett	1e9abaf002	[Arcade] Add more games to private servers	2015-05-15 23:38:43 -05:00
libraryaddict	f899194e3b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-15 12:23:27 +12:00
libraryaddict	091f98fa9d	DrawMyThing: Remove all found words from the checked string when looking for multiple guesses	2015-05-15 12:23:05 +12:00
Shaun Bennett	6b7c52cb87	[Arcade] Add additional hub clock check	2015-05-14 15:17:45 -05:00
Jonathan Williams	5a8f93f3db	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-14 00:12:22 -07:00
Jonathan Williams	b7cdc82cd2	Fixed server sorter for UHC. ... Work on converting to UltraDNS api.	2015-05-14 00:12:13 -07:00
Mini-Chiss	d390d83dd1	removed some meh words	2015-05-13 22:35:26 -05:00
Mini-Chiss	f49c2ca546	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-13 22:27:41 -05:00
Shaun Bennett	0d2157b4f3	[Core] Fix /stats lava bucket bug	2015-05-13 23:23:43 -05:00
Shaun Bennett	2c020d10a6	Merge remote-tracking branch 'origin/master'	2015-05-13 22:52:22 -05:00
Shaun Bennett	84c53347f8	[Hub] Add UHC to Quick server menu. Better formatting coming soon!	2015-05-13 22:52:14 -05:00
Mini-Chiss	e68a2775e8	ex p chnage	2015-05-13 22:27:33 -05:00
libraryaddict	67f1e4ad1f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-14 14:29:43 +12:00
libraryaddict	0fc1d680af	UHC: Add 20 seconds of invincibility on game start	2015-05-14 14:29:30 +12:00
Mini-Chiss	44cb6d8a62	increased exp more	2015-05-13 17:08:56 -05:00
libraryaddict	4bc38e3396	Arcade: Removed ocean, river and swampland from biome generation for UHC	2015-05-14 09:55:22 +12:00
Jonathan Williams	a6cf1309ff	Fix for ranks not applying.	2015-05-13 14:33:31 -07:00
Jonathan Williams	5bb91f4167	Catch null taskList	2015-05-13 14:27:35 -07:00
libraryaddict	c46bdfd2dc	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-14 09:18:51 +12:00
libraryaddict	1b27e84e54	DrawMyThing: Fixed a check being in the wrong brackets	2015-05-14 09:18:35 +12:00
Mini-Chiss	093bbde792	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-13 15:45:41 -05:00
Mini-Chiss	2c3116a7a6	removed firework and sound from legend join	2015-05-13 15:45:29 -05:00
Mini-Chiss	bd58c06017	fixed being able to team with self in UHC ... fixed eventgame admin toggle	2015-05-13 13:32:20 -05:00
Mini-Chiss	c34cac42ee	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-13 13:20:14 -05:00
Mini-Chiss	c26174ffa2	fixed team name	2015-05-13 13:20:05 -05:00
Jonathan Williams	3b024de521	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-13 01:35:05 -07:00
Jonathan Williams	1c6a12528c	Added ability for LT to modify Admin ranks. ... Added Twithc rank to the updateRank list. Fixed server sorting issues with UHC Generating servers.	2015-05-13 00:58:45 -07:00
libraryaddict	bfb5e85efd	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-13 19:14:56 +12:00
libraryaddict	938386bf77	Wizards: Removed chainmail loot, added gold armor instead	2015-05-13 19:14:40 +12:00
Jonathan Williams	98dcb9747a	Added UHC support to server sorter.	2015-05-13 00:10:17 -07:00
Jonathan Williams	82903fde47	Updates for task conversion.	2015-05-13 00:00:37 -07:00
Mini-Chiss	a744a466a3	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-13 00:05:10 -05:00
Mini-Chiss	f9735006b8	removed hub uhc hourly announcements	2015-05-13 00:05:00 -05:00
libraryaddict	20aeccb3be	Wizards: Lowered ice shards max level to 3, removed damage from web shot	2015-05-13 14:04:19 +12:00
libraryaddict	744c867990	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-13 13:19:09 +12:00
libraryaddict	d2e37df4ca	DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word	2015-05-13 13:18:54 +12:00
libraryaddict	a75aab7f98	DrawMyThing: Added more words, fixed the multiple guesses prevention never firing.	2015-05-13 13:15:53 +12:00
Shaun Bennett	678c2c514a	Oops!	2015-05-12 18:45:01 -05:00
Shaun Bennett	aa5898e1db	Merge remote-tracking branch 'origin/master'	2015-05-12 18:43:48 -05:00
Shaun Bennett	f9269b534f	[Core] Add look AI to NPC's	2015-05-12 18:43:26 -05:00
Shaun Bennett	32338cfce4	[MB] More words for update	2015-05-12 17:25:37 -05:00
Shaun Bennett	d703070810	[Core] Shrink stat page	2015-05-12 17:20:58 -05:00
Shaun Bennett	bdfffa3a4c	Merge remote-tracking branch 'origin/master'	2015-05-12 17:14:57 -05:00
Shaun Bennett	53555a42cd	[Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats	2015-05-12 17:14:50 -05:00
libraryaddict	03c384e7e6	Wizards: Remove boat from loot, fix napalm typo	2015-05-13 10:04:05 +12:00
Shaun Bennett	26db4fa269	[MB] Add more build themes	2015-05-12 16:15:44 -05:00
Mini-Chiss	e1dd3a318e	UHC!!!!!	2015-05-12 15:52:19 -05:00
Mini-Chiss	2928c73767	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-12 14:46:30 -05:00
Mini-Chiss	e13e735246	UHC updates!	2015-05-12 14:46:21 -05:00
Shaun Bennett	90fc4656fa	[Core] Attempt at mitigating spam bots without hurting normal players	2015-05-12 08:09:13 -05:00
Shaun Bennett	5d13b6a144	[Core] Disable writing on signs for muted players	2015-05-12 07:11:35 -05:00
Shaun Bennett	87f495e376	[Core] Filter text on placed signs with Chat Module	2015-05-12 07:02:34 -05:00
Shaun Bennett	c7a9ae8cd5	[Arcade] Attempt at fixing spectator gui bugs	2015-05-12 06:23:32 -05:00
Shaun Bennett	06a0f3d0d5	Merge remote-tracking branch 'origin/master'	2015-05-12 00:37:40 -05:00
Shaun Bennett	270ef37a7c	[MB] More words and more ground types	2015-05-12 00:37:13 -05:00
Mini-Chiss	4cae02f2d8	set LT as higher than Owner for perms.	2015-05-11 21:31:37 -05:00
Mini-Chiss	e0e79d79a5	LT rank	2015-05-11 21:28:25 -05:00
Mini-Chiss	ed90e97c68	removed border attack stuff	2015-05-11 21:00:38 -05:00
Shaun Bennett	9d959ee7a3	Fix/Enable Look at me Button	2015-05-11 20:46:37 -05:00
Mini-Chiss	643ed2c047	Fixed most enchants not working ... added commands to event minor update to snowfight to make it more fun	2015-05-11 19:55:26 -05:00
libraryaddict	18c6022437	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-12 11:01:18 +12:00
libraryaddict	214a750f6e	UHC: Add borders from SG	2015-05-12 11:01:04 +12:00
Mini-Chiss	8d585ce807	admins can giveitem	2015-05-11 17:59:13 -05:00
Mini-Chiss	55b6d29468	Just shufflin some location	2015-05-11 17:57:21 -05:00
libraryaddict	a558995e12	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-12 09:52:21 +12:00
Shaun Bennett	d57bab7430	Merge remote-tracking branch 'origin/master'	2015-05-11 15:17:50 -05:00
Shaun Bennett	e799ea0909	[MB] Look at me Button (Disabled - not working properly), Villager profession button, Small bug fixes	2015-05-11 15:17:35 -05:00
Mini-Chiss	e3f2c02836	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-11 14:11:00 -05:00
Mini-Chiss	5e73441b9a	UHC world loading	2015-05-11 14:10:51 -05:00
Mini-Chiss	123af16bd2	UHC map gen	2015-05-11 13:25:05 -05:00
Shaun Bennett	c0dc531252	[MB] Allow Item Frames and Paintings	2015-05-11 12:38:21 -05:00
Mini-Chiss	5ec60d234a	UHC changes	2015-05-11 12:27:43 -05:00
Mini-Chiss	9b0736816b	UHC changes ... abstracted out some common attribs	2015-05-11 12:21:32 -05:00
Jonathan Williams	b1a46d0f0d	Converted TaskManager	2015-05-11 01:21:27 -07:00
Shaun Bennett	46c07665e1	Merge remote-tracking branch 'origin/master'	2015-05-11 00:44:34 -05:00
Shaun Bennett	2e7428e79a	Temporary fletcher fix	2015-05-11 00:42:55 -05:00
libraryaddict	5ee3f48754	Wizards: Nerf rumble max level from level 5 to level 3	2015-05-11 14:08:40 +12:00
Shaun Bennett	800ce68637	Add Beta Games and Player Servers to Quick game menu (text probably needs tweaking)	2015-05-10 16:58:04 -05:00
libraryaddict	241935ef63	SurvivalGames: Removed description of deep freeze and updated to beware of borders	2015-05-11 09:13:04 +12:00
Mini-Chiss	3e64115f05	vote colors	2015-05-09 17:45:08 -05:00
Mini-Chiss	41599de06f	build vote update	2015-05-09 17:34:07 -05:00
Mini-Chiss	6e2b437e55	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-09 12:28:16 -05:00
Mini-Chiss	822718095d	cannot PM from spawn ... first push of cards game	2015-05-09 12:23:07 -05:00
libraryaddict	7faee918af	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-09 14:13:03 +12:00
libraryaddict	0751876622	Wizards: Do a null check and event is cancelled check on damage	2015-05-09 14:12:46 +12:00
Shaun Bennett	ef86f8bb6f	merge	2015-05-08 12:22:58 -05:00
Shaun Bennett	bca162588f	Fix Achievement page bugs (layout needs to be reviewed by chiss)	2015-05-08 02:27:53 -05:00
libraryaddict	689ca94c57	Wizards: Nerf rainbow beam damage, rebalance gust spell, raise armor effectiveness	2015-05-08 18:57:33 +12:00
libraryaddict	29c4a033a7	Achievement: Fix wizards 10 win to 50 wins, change wizards to blaze rod, change stats layout	2015-05-08 18:56:00 +12:00
libraryaddict	5ec04263d4	Map stuff: First commit (or second?)	2015-05-08 07:31:03 +12:00
Jonathan Williams	f2c8086421	Updated default motd on bungees.	2015-05-06 22:41:36 -07:00
Jonathan Williams	e999f943b5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-06 20:20:07 -07:00
Jonathan Williams	d3e5dd9c8a	Fixed so name searching only returns the last account logged in with that name.	2015-05-06 20:19:58 -07:00
libraryaddict	3e02806b75	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-07 02:57:20 +12:00
libraryaddict	531fe11916	Maps: Rename Map.class to BlockMap.class	2015-05-07 02:57:12 +12:00
libraryaddict	7a8efee1e0	Modify builder to include png files in the built jar	2015-05-07 02:56:37 +12:00
libraryaddict	47acf7fb85	DrawMyThing: Ignore guesses containing more than two answers.	2015-05-07 02:54:55 +12:00
Ty Sayers	6b3028605e	Merge branch 'master' into clans_custom_gear	2015-05-05 15:58:03 -04:00
Ty Sayers	66c9fefc6e	Add leftover Clans commit to introduce GearManager.	2015-05-05 15:34:32 -04:00
Ty Sayers	7567648312	Add CustomItem hierarchy for Clans project, introducing rare gear that can be decorated with various ItemAttributes for unique effects.	2015-05-05 15:33:42 -04:00
Jonathan Williams	a7407d8b8c	Added all minigames standalones into mixed arcade player count.	2015-05-04 22:51:21 -05:00
Jonathan Williams	f9f1d9b1ad	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-04 22:31:14 -05:00
Shaun Bennett	ae03743c63	Build sort of bug fix for teleported into block	2015-05-04 19:27:16 -05:00
Mini-Chiss	4cb0c01f59	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-04 15:35:10 -05:00
Mini-Chiss	7505bbc1a2	gravity fix	2015-05-04 15:34:57 -05:00
Peter Miller	4f54b9aa04	Bamboo...	2015-05-04 05:10:37 -04:00
Peter Miller	ad82e9733a	Moarerer Bamboo changes.	2015-05-04 04:33:28 -04:00
Peter Miller	93656f7659	Moarer Bamboo changes.	2015-05-04 04:28:34 -04:00
Peter Miller	c93cd0d36c	Moar Bamboo changes.	2015-05-04 04:25:44 -04:00
Peter Miller	3b518aec3f	More build changes for Bamboo.	2015-05-04 04:14:19 -04:00
Jonathan Williams	4252bf70df	Fix Master Builder game button in quick menu.	2015-05-04 01:40:57 -05:00
Mini-Chiss	0d1de153ec	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-04 00:56:19 -05:00
Mini-Chiss	b959bcaa90	fixed 1.8 req	2015-05-04 00:56:12 -05:00
Jonathan Williams	677c8d1198	Updated default MOTD.	2015-05-04 00:42:59 -05:00
Jonathan Williams	c8b5c84aa6	Added Master Builder quick game menu option. ... Added player counts to quick game menu	2015-05-04 00:42:49 -05:00
Mini-Chiss	50cd692c62	fixed wither morph damaging blocks in grav lobby	2015-05-04 00:34:03 -05:00
Mini-Chiss	4f4aeac12c	fixed typo	2015-05-03 23:34:09 -05:00
Mini-Chiss	fa1ac52f78	grav balance	2015-05-03 20:21:00 -05:00
Mini-Chiss	838c369b7c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-03 20:12:13 -05:00
Mini-Chiss	95c9be47b6	missing kit	2015-05-03 20:12:06 -05:00
Shaun Bennett	cb2666c4a5	Merge remote-tracking branch 'origin/master'	2015-05-03 20:06:19 -05:00
Shaun Bennett	af1f735a43	Add lightning packets, various gui improvements	2015-05-03 20:06:10 -05:00
Mini-Chiss	e013f8af8a	sky text for hub change	2015-05-03 19:49:16 -05:00
Mini-Chiss	58671fa229	more words	2015-05-03 19:36:50 -05:00
Mini-Chiss	6978a176b1	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-03 19:10:55 -05:00
Mini-Chiss	7f0e175ba1	build update	2015-05-03 19:10:49 -05:00
Shaun Bennett	044d1098f4	Merge remote-tracking branch 'origin/master'	2015-05-03 19:10:22 -05:00
Shaun Bennett	a435ed5bae	More build changes	2015-05-03 19:10:13 -05:00
Mini-Chiss	1576085d87	more words	2015-05-03 18:33:31 -05:00
Mini-Chiss	73132d96b9	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-03 18:33:03 -05:00
Mini-Chiss	f36d7774cc	Gravity update	2015-05-03 18:32:57 -05:00
Shaun Bennett	de1f432be4	Build bug fixes	2015-05-03 18:31:56 -05:00
Shaun Bennett	74474c6227	Use itemstackfactory for formatted name	2015-05-03 18:26:20 -05:00
Shaun Bennett	f98ac0874c	Merge remote-tracking branch 'origin/master'	2015-05-03 18:22:14 -05:00
Shaun Bennett	83ff3c96aa	Close inventory when game starts	2015-05-03 18:21:59 -05:00
Shaun Bennett	fbfb5e637e	Mob Gui + Ground Change Gui + UtilSkull for special mob skulls	2015-05-03 18:18:16 -05:00
Mini-Chiss	a42c71ebb8	more 1.8 stuff	2015-05-03 16:54:02 -05:00
Mini-Chiss	bd8bd2dfd6	Abstracted kicking non-1.8 players ... Abstracted resource pack msg	2015-05-03 16:51:13 -05:00
Mini-Chiss	40d56c3500	Converted all code to updated UtilParticle methods ... /suicide	2015-05-03 16:37:00 -05:00
Mini-Chiss	97a86fde90	builds!	2015-05-03 15:39:15 -05:00
Mini-Chiss	a07132df49	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-03 15:39:04 -05:00
Shaun Bennett	c3a7dcfcf8	Update craftbukkit jar	2015-05-03 15:35:42 -05:00
Shaun Bennett	73719e0df3	Fix world particles issues	2015-05-03 15:30:58 -05:00
Mini-Chiss	40c838b030	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-03 14:50:56 -05:00
Mini-Chiss	8224450b44	Build Update	2015-05-03 14:50:50 -05:00
Shaun Bennett	17cbcc3771	Craftbukkit changes for UtilParticle update, and UtilParticle fix	2015-05-03 14:42:31 -05:00
Shaun Bennett	74dbf7e827	Merge remote-tracking branch 'origin/master'	2015-05-03 14:41:18 -05:00
Shaun Bennett	ff6da92fb7	Some Build world, support for far rendered particles	2015-05-03 14:41:09 -05:00
libraryaddict	b58bef1bd8	ResourcePack: Lengthen timeout from 10 seconds to 20 seconds	2015-05-04 04:13:23 +12:00
libraryaddict	9986bd6ee5	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-04 04:10:05 +12:00
libraryaddict	3fcec13e68	Wizards: Melee with wands should say it was wands that did it	2015-05-04 04:09:49 +12:00
Shaun Bennett	11b36e6b44	[Build] Show message to players to open inventory until they click something in their inventory	2015-05-02 22:50:27 -05:00
Mini-Chiss	9c08e57602	fixed NPE	2015-05-02 22:45:14 -05:00
Mini-Chiss	122dbad45c	added time setting and framework for lightning strikes	2015-05-02 22:26:03 -05:00
Mini-Chiss	6ad09f0ade	Master Builder update	2015-05-02 22:05:12 -05:00
Mini-Chiss	5b04d43400	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-02 17:45:39 -05:00
libraryaddict	08140f8863	ResourcePack: Resource pack refused now links to a forum guide	2015-05-03 08:10:25 +12:00
libraryaddict	8cb9493125	Wizards: Rainbow Road no longer lasts more than 20 seconds, cooldown never decreases	2015-05-02 16:39:20 +12:00
libraryaddict	9c268786aa	Wizards: Nerfed lightning strike damage	2015-05-02 16:22:59 +12:00
libraryaddict	efed6e129b	Wizards: Removed fishing rod from loot, fixed overtime locations not permitted to touch the highest block.	2015-05-02 16:11:57 +12:00
libraryaddict	3e9b64db66	Wizards Implode: Don't cast spell if no blocks are effected	2015-05-02 15:26:23 +12:00
libraryaddict	cd1a5793fa	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-02 15:24:16 +12:00
Jonathan Williams	707772d58b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-01 22:07:33 -05:00
Jonathan Williams	2902e6075f	Fix for n positive bug.	2015-05-01 22:05:03 -05:00
libraryaddict	05c9174491	Wizards: Prevent using keyboard shortcuts to drop hotbar locked items	2015-05-02 14:59:15 +12:00
Mini-Chiss	ab6937a525	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-01 18:05:55 -05:00
Shaun Bennett	e04b61a91d	Give build item when game starts	2015-05-01 18:03:56 -05:00
Shaun Bennett	244ffece8a	Fixes for build game + fix clans compile	2015-05-01 18:02:06 -05:00
Shaun Bennett	910cdff935	Merge remote-tracking branch 'origin/master' ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java	2015-05-01 17:54:00 -05:00
Shaun Bennett	37f1f7eabb	Master Builders changes for chiss	2015-05-01 17:46:42 -05:00
Ty Sayers	ac14cc40f4	Revert "Encapsulate remote process related code into new project ServerProcesses for better dependability. Likewise, add project Queue.Core for queue related API methods. Queuer incorporated into new matchmaking logic for matching and pairing players for ranked matches, as well as handling server management. Adapt Core and Arcade to new ranked system for proper loading, modification, and saving of rankings." ... This reverts commit 02e9649c20.	2015-05-01 12:34:32 -04:00
Ty Sayers	02e9649c20	Encapsulate remote process related code into new project ServerProcesses for better dependability. Likewise, add project Queue.Core for queue related API methods. Queuer incorporated into new matchmaking logic for matching and pairing players for ranked matches, as well as handling server management. Adapt Core and Arcade to new ranked system for proper loading, modification, and saving of rankings.	2015-05-01 12:33:11 -04:00
libraryaddict	b136be0d47	ResourcePack: Removed code that demanded a enum and changed to boolean	2015-05-02 03:03:53 +12:00
libraryaddict	e8cbb2fc29	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-01 21:26:56 +12:00
libraryaddict	93a25d5a67	ResourcePack: Fixed links and declined message	2015-05-01 21:26:42 +12:00
Jonathan Williams	fb634c190e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-05-01 02:29:54 -05:00
Jonathan Williams	84a5e5e521	Added motd.	2015-05-01 02:29:34 -05:00
Jonathan Williams	e800d74976	Disabled Double Gems.	2015-05-01 02:29:20 -05:00
libraryaddict	c240a1752f	GameType: Update resource pack to use https not http	2015-05-01 19:28:42 +12:00
libraryaddict	f85d27db1a	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-01 19:25:11 +12:00
libraryaddict	cc65830f9b	ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code	2015-05-01 19:24:20 +12:00
Jonathan Williams	283d550903	Added Wizards to quick game menu.	2015-05-01 01:24:01 -05:00
Mini-Chiss	1b8ab13160	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-05-01 00:51:52 -05:00
Mini-Chiss	ba5802cc14	wizards kit availability	2015-05-01 00:47:51 -05:00
Jonathan Williams	fa4466b6a9	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-05-01 00:13:39 -05:00
libraryaddict	88bd99e11f	Wizards: Update UtilTextBottom text for the custom method	2015-05-01 16:57:11 +12:00
Jonathan Williams	af86586d74	Added 'Sloth' to draw my thing list.	2015-04-30 23:57:11 -05:00
Jonathan Williams	d161d62773	Added chat filtering to private messages.	2015-04-30 23:56:08 -05:00
Jonathan Williams	b33828f5a1	Added LibraryAddict's crash exploit patch for craftbukkit.jar	2015-04-30 23:48:58 -05:00
Mini-Chiss	21800d83c6	Build fixes	2015-04-30 23:16:30 -05:00
libraryaddict	319cde5c46	Wizards: Update resource pack url	2015-05-01 16:14:59 +12:00
libraryaddict	fbafeca150	Wizards: Remove block burn flag true	2015-05-01 15:44:11 +12:00
libraryaddict	82cd4208bd	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2015-05-01 14:22:53 +12:00
libraryaddict	c660e0e3c7	Wizards: Re-sorted spells	2015-05-01 14:19:13 +12:00
libraryaddict	7bd133f704	Wizards: Temporary resource pack	2015-05-01 13:04:05 +12:00
Mini-Chiss	ed1c7e2336	Master Builders initial push (dont worry jon it doesnt effect anything for the update!)	2015-04-30 18:20:35 -05:00
Shaun Bennett	4ac4e9d729	Start of world event framework	2015-04-30 13:15:20 -05:00
libraryaddict	5d36ddce3a	Arcade: Close only non-player inventories at 5 seconds	2015-04-30 21:17:08 +12:00
libraryaddict	23ea7bbce4	Spectators: Set fire ticks to 0 on damage	2015-04-30 20:55:30 +12:00
Peter Miller	152f5d3046	Ditto previous commit...	2015-04-29 16:52:06 -04:00
Peter Miller	69d4d2dfdb	Another try at build changes.	2015-04-29 16:47:06 -04:00
libraryaddict	33bbe96964	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards	2015-04-30 01:33:43 +12:00
libraryaddict	497550549b	ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub.	2015-04-30 01:33:21 +12:00
libraryaddict	c2b7001fcc	Wizards: Current progress	2015-04-30 01:32:22 +12:00
Peter Miller	1e6084bfb2	Another compilation order change.	2015-04-28 10:31:25 -04:00
Peter Miller	93abe301c2	More compilation depedency changes.	2015-04-28 10:18:53 -04:00
Peter Miller	1dc9864e4c	Added necessary libraries to compilation targets.	2015-04-28 10:00:12 -04:00
Peter Miller	e1ddf55860	Adjusting build order of compile targets in common.xml.	2015-04-28 09:36:43 -04:00
Peter Miller	e68e99d1f6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-28 09:25:05 -04:00
Peter Miller	0ce7f657e1	Added compilation targets for Arcade/Hub building with Ant.	2015-04-28 09:24:35 -04:00
Mini-Chiss	45b801ba81	hitbox changes	2015-04-27 19:21:33 -05:00
Shaun Bennett	872d84d4b0	More 1.8 work	2015-04-27 15:58:51 -05:00
Shaun Bennett	ed0db983f8	More work on 1.8 update	2015-04-23 08:28:19 -04:00
Shaun Bennett	20b5ee8b65	More spigot build changes	2015-04-23 08:20:07 -04:00
Shaun Bennett	cf4353bedf	Delete some classpath dummy changes, jsonmessage fixed	2015-04-22 16:37:45 -04:00
libraryaddict	1c1ab9bbe3	Throwing TNT: Fixed tnt not being movable from other inventories	2015-04-23 08:30:23 +12:00
Shaun Bennett	50ff48ffba	Packet changes to spigot build	2015-04-22 16:20:39 -04:00
Shaun Bennett	f4b6d4e44e	Starting on converting to 1.8	2015-04-22 16:06:38 -04:00
Jonathan Williams	ae1480fb1e	Little bit of spacing fixed.	2015-04-21 23:36:33 -05:00
Jonathan Williams	a662c93a92	Fix so 0.0.0.0 doesn't get selected for DNS rotation.	2015-04-21 23:36:12 -05:00
Jonathan Williams	d8ed866ada	Fix for duplicate names in db. ... Adjusted staff server whitelist and op list.	2015-04-21 23:35:41 -05:00
Shaun Bennett	9ee740d334	Updated craftbukkit to latest spigot (local repo was a few commits behind)	2015-04-21 20:28:22 -04:00
Shaun Bennett	1e304ff205	Update BungeeCord to latest build	2015-04-21 20:19:20 -04:00
Shaun Bennett	f91345bce0	Update craftbukkit modified to 1.8 build	2015-04-21 20:18:56 -04:00
Shaun Bennett	5c6c4a23d5	Rename SDK to 1.8 instead of 1.7 (IDEA)	2015-04-21 20:10:01 -04:00
libraryaddict	2aaa93e58f	ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name	2015-04-22 05:38:32 +12:00
libraryaddict	b29893ff60	Merge branch 'ResourcePack' into Wizards	2015-04-22 03:46:25 +12:00
libraryaddict	9f8fe3bf78	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-04-22 03:45:59 +12:00
libraryaddict	aeff6bf4b9	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards	2015-04-22 00:25:56 +12:00
Shaun Bennett	2b8137fc66	Merge remote-tracking branch 'origin/master'	2015-04-21 00:20:40 -04:00
libraryaddict	0196a5c359	Wizards: Latest changes by Chiss	2015-04-21 13:54:19 +12:00
Shaun Bennett	3dddd7112c	Update MOTD to not use animation anymore (Bug fixed in 1.8.4!)	2015-04-20 17:16:57 -04:00
Cheese	c73a6ae62f	champs balance	2015-04-19 13:49:46 +10:00
Cheese	f4a91455f6	Champions Balance	2015-04-19 12:22:51 +10:00
libraryaddict	cd47da179a	Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining	2015-04-18 06:12:34 +12:00
libraryaddict	9db8aff37a	Wizards: Changed spell icons for resource pack	2015-04-18 06:10:23 +12:00
Cheese	91a70d6a04	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-16 21:06:19 +10:00
Cheese	b352b28fdc	fixed MAC still being disabled	2015-04-16 21:05:56 +10:00
libraryaddict	25dfeacb09	Wizards: Spell levels are now viewable on items in chest as item amount	2015-04-16 16:20:01 +12:00
libraryaddict	8803941bd8	Wizards: More changes as per demand.	2015-04-16 05:51:08 +12:00
Jonathan Williams	99436b4a42	Added Tab event back :D	2015-04-14 02:01:04 -05:00
Jonathan Williams	556a9df945	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-14 01:59:59 -05:00
Jonathan Williams	c454973398	Changed login deets for new new db cluster.	2015-04-14 01:59:29 -05:00
Jonathan Williams	eea4b98069	Removed unused AccountManager.java	2015-04-14 01:59:09 -05:00
Cheese	f7ef44b007	More hitbox nerfs	2015-04-14 16:43:02 +10:00
Cheese	6cc18b61d1	reduced hitbox on flesh hook and lightning orb	2015-04-14 16:38:11 +10:00
Jonathan Williams	3d6dce24ff	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-14 01:32:11 -05:00
Jonathan Williams	e3a328c70d	Revert "Work on FriendRepository, still not enabled yet." ... This reverts commit 405d0fec18. Re-enabled friends.	2015-04-14 01:32:03 -05:00
Cheese	058e5b9045	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-14 09:44:58 +10:00
Cheese	482ee6eb79	changed builder rank name	2015-04-14 09:35:35 +10:00
libraryaddict	073c7d16c2	Wizards Napalm: Make glazed blocks more common, raise damage	2015-04-13 15:06:52 +12:00
libraryaddict	e0b0975195	Bridge: Prevent hoppers being crafted to prevent abuse	2015-04-13 14:38:32 +12:00
libraryaddict	c36c800bb5	AchievementManager: Add SnrMod as a min MP level of 15	2015-04-13 14:05:50 +12:00
libraryaddict	12b3a582b2	CustomExplosion: Fixed loop, added max damage	2015-04-12 23:21:19 +12:00
libraryaddict	be21968805	UtilBlock: Added a method that may or may not tell you the blocks destroyed in an explosion	2015-04-12 23:20:52 +12:00
libraryaddict	03fb8c203e	Wizards: Balancing	2015-04-12 23:20:15 +12:00
libraryaddict	81aeff86bf	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards	2015-04-12 20:15:28 +12:00
Cheese	d290078790	Damage multipliers now effect damage modifiers - this also fixes a bug!	2015-04-11 16:33:18 +10:00
Cheese	1378dcb815	Properly fixed MS spec bug	2015-04-11 11:45:27 +10:00
Cheese	9b2c4662c3	fixed minestrike bug where newly joined specs could buy/drop items ... removed easter baskets	2015-04-11 11:25:25 +10:00
libraryaddict	afa372dca7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards ... Conflicts: Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java	2015-04-11 12:20:29 +12:00
libraryaddict	43163cd7d7	UtilParticle: Added lore for future reference on colored particles.	2015-04-11 12:14:12 +12:00
libraryaddict	28d0e28607	UtilShapes: Fixed getting BlockFace's being bugged and weird sometimes, added another method to get diagonal faces between two diagonals	2015-04-11 12:13:37 +12:00
libraryaddict	2d59bb4010	CustomExplosion: Added option to limit falling blocks that spawn, removed 'Reason' to prevent CustomDamageEvent from using a mod instead of initialDamage (wtf?)	2015-04-11 12:12:47 +12:00
libraryaddict	fc7c6e5831	Wizards changes	2015-04-11 12:11:50 +12:00
Jonathan Williams	49431da509	Fix for pulling account UUID with multiple.	2015-04-10 10:53:11 -05:00
Cheese	3d95a5cfa4	bloock toss fix	2015-04-10 14:09:21 +10:00
Cheese	85c9f9010e	Added Twitch Rank ... fixes hitbox on glacial	2015-04-10 13:11:02 +10:00
Cheese	c3798834c3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-07 08:30:45 +10:00
Cheese	18ba446764	re-enabled MAC	2015-04-07 08:30:32 +10:00
Jonathan Williams	9f6a89bfc6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-06 04:14:12 -07:00
Jonathan Williams	679d5faa9b	Motd pull on start.	2015-04-06 04:14:04 -07:00
Jonathan Williams	4eb1f67d82	Removed code to set default motd.	2015-04-06 04:13:13 -07:00
Cheese	e0a58ba165	champions exploit fix update	2015-04-06 19:57:33 +10:00
Cheese	cdb86d3ebb	champions exploit fixes and balance	2015-04-06 17:17:36 +10:00
Cheese	6c3fc3009b	fixed sheep quest bug where players were unable to pick up sheep rapidly ... fixed bug where falling blocks were instantly hitting players	2015-04-06 13:03:59 +10:00
Jonathan Williams	782db26d10	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-04 01:27:08 -07:00
Cheese	93abca0c01	can no logner break levers and other usables in SG	2015-04-04 16:12:33 +11:00
Cheese	db1a3afa19	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-04 16:02:24 +11:00
Cheese	dc84621b6c	blizzard snowballs expire	2015-04-04 16:01:48 +11:00
libraryaddict	9518d9f438	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-04-04 17:33:51 +13:00
libraryaddict	c1c4e8b417	Disguises: Fixed DisguisePlayer not using a random UUID to prevent conflicts, fixed non-player living entities not being disguisable	2015-04-04 17:33:33 +13:00
Cheese	c79432c8b9	Fixed projectile hitboxes and specific values	2015-04-04 10:54:03 +11:00
Jonathan Williams	d25b39058a	Fixed bunny morph name.	2015-04-03 04:19:48 -07:00
Cheese	ae298644e2	removed random egg color, looked ugly	2015-04-03 22:02:22 +11:00
Cheese	3cadbf3a34	fixed color in egg	2015-04-03 22:00:54 +11:00
Cheese	f87511331e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-03 21:47:57 +11:00
Cheese	ff0883e7d7	fixed easter egg duration ... parser list improvement	2015-04-03 21:47:43 +11:00
Jonathan Williams	8567701e1d	Updated Motd.	2015-04-03 03:20:11 -07:00
Jonathan Williams	0119e99adf	Added EasterBunny package for support server.	2015-04-03 03:07:49 -07:00
Jonathan Williams	726c03af58	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-03 03:00:21 -07:00
Cheese	54948cc61e	disabled rabbit buying	2015-04-03 20:59:56 +11:00
Jonathan Williams	158cc0909b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-03 02:37:46 -07:00
Cheese	23df6daab0	Added Easter Morph ... Added Eggs Baskets in games Added double gem for 1.8	2015-04-03 20:31:23 +11:00
Jonathan Williams	c4de261b69	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-04-03 02:21:11 -07:00
Jonathan Williams	aa089314f0	Completely removed Testing group from dead checks and laggy checks in server monitor.	2015-04-03 01:56:36 -07:00
libraryaddict	66c83397e5	DisguiseManager: Add DisguiseRabbit	2015-04-03 20:52:09 +13:00
Jonathan Williams	a8aab1fea0	Motd changes.	2015-04-02 23:38:29 -07:00
Jonathan Williams	120420d35f	Really fixed disguise memory leak this time.	2015-04-02 23:37:43 -07:00
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