Commit Graph

4516 Commits

Author SHA1 Message Date
Cheese 4519f2dda1 Merge branch 'EventGameUpdates' 2015-09-22 14:59:17 +10:00
Shaun Bennett 86420132ce Clan name->uuid changes 2015-09-21 20:05:16 -04:00
libraryaddict 452e8a9694 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-09-19 12:11:21 +12:00
Shaun Bennett 901dad2f8a Add vote3 to bonusmanager 2015-09-17 22:31:18 -04:00
Shaun Bennett 6a4c9061fa Supply drop, loot, small fixes 2015-09-17 22:19:45 -04:00
libraryaddict 5e8fc77164 Add pages to spectator and in-progress server menu 2015-09-17 04:34:45 +12:00
Sarah 362d99a819 Fixing up Gem signs, Effects etc. 2015-09-15 07:10:39 +02:00
libraryaddict 655283e008 Progress on spider 2015-09-14 23:23:12 +12:00
Sarah 7ca6f58108 Adding Gem signs. 2015-09-13 10:25:44 +02:00
Sarah a46cb2c274 last fix in the listAreaInfo method. 2015-09-13 00:35:22 +02:00
Sarah 53d5c2fd0e adding area info command. 2015-09-13 00:30:55 +02:00
Sarah 112f94a842 forgot to add command to remove potion effects. 2015-09-13 00:00:47 +02:00
Sarah fcec6253cd fixing @p on signs, adding potioneffects and gadgets to areas. 2015-09-12 23:56:38 +02:00
Sarah b6ffee73f5 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates 2015-09-12 21:17:45 +02:00
Jonathan Williams 1417d31b73 Added 60s delay to timings enable check. 2015-09-11 23:57:26 -07:00
Cheese c9971bb117 fixed duplicate rank name 2015-09-12 16:45:22 +10:00
Cheese 6216f2ced4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-12 16:33:44 +10:00
Jonathan Williams a7d4a7534f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-11 22:51:04 -07:00
Jonathan Williams 2380b9041d Added automatic timings report in the event of lag.
Added more exception handling around LoadingWindow
2015-09-11 22:50:53 -07:00
Cheese 119dc8ab52 changed name of method 2015-09-12 15:01:18 +10:00
Sarah 5c0ada3df6 Implementing RequiredRank file and command. 2015-09-12 06:39:40 +02:00
Cheese 4184fe20cf minor fixes 2015-09-12 14:09:04 +10:00
Sarah b56813deef Improving /e commands (/e kick, /e area, etc) 2015-09-12 04:33:10 +02:00
Ty Sayers 323921dcfa Merge pull request #62 in MIN/mineplex from clans_custom_gear to clans-beta
* commit '0bafae64850c9538fac0c62eb5ae9185de23eca6':
  Fix bug where certain damage events threw excessive NPEs based on spawn protection checks.
2015-09-11 17:10:43 -05: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 fbb5e26cf4 Merge pull request #61 in MIN/mineplex from clans_custom_gear to clans-beta
* commit '9be0ecc598e0d1fd3f47881a19e88a56cf9b833c':
  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.
  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-11 17:02:53 -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
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
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
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 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