From e8a1c9bcba240c69868613d8ca6ea1d0cc648b49 Mon Sep 17 00:00:00 2001 From: Alex-The-Coder Date: Fri, 8 Jul 2016 07:42:00 -0400 Subject: [PATCH 1/2] Add damage check to the Enchantment Handler... ...to avoid performing calculations where it is not necessary --- .../mineplex/minecraft/game/core/damage/DamageManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java index b1276bdc9..dbd552deb 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java @@ -378,6 +378,10 @@ public class DamageManager extends MiniPlugin Player damagee = event.GetDamageePlayer(); if (damagee != null) { + if (event.GetDamage() <= 0) + { + return; + } if (getTotalEnchantReduction(damagee.getInventory().getArmorContents(), event.GetCause()) > 0) { event.AddMult("Ench Prot", damagee.getName(), getTotalEnchantReduction(damagee.getInventory().getArmorContents(), event.GetCause()), false); From 5b98bfddce07e04533e1e4b403a57028b2259cc4 Mon Sep 17 00:00:00 2001 From: cnr Date: Fri, 8 Jul 2016 15:09:48 -0500 Subject: [PATCH 2/2] Update YouTube link to landing + sub confirmation --- .../src/mineplex/core/bonuses/gui/buttons/YoutubeButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/YoutubeButton.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/YoutubeButton.java index bddc4081b..dd741b450 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/YoutubeButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/YoutubeButton.java @@ -71,7 +71,7 @@ public class YoutubeButton implements GuiItem message = "Click here to visit our YouTube page!"; } - new JsonMessage(C.cAquaB + message).click(ClickEvent.OPEN_URL, "https://www.youtube.com/embed/RW3sOmkiEG-A?list=UU1MtBclG_aHPd0nLmUupCKg&controls=0&showinfo=0").sendToPlayer(_player); + new JsonMessage(C.cAquaB + message).click(ClickEvent.OPEN_URL, "http://youtube.com/mineplexgamesofficial?sub_confirmation=1").sendToPlayer(_player); } @Override