From 3281eb2ed712b83754a8ad89f2baeb4dcd3ac0e5 Mon Sep 17 00:00:00 2001 From: Chiss Date: Mon, 21 Apr 2014 08:47:07 +1000 Subject: [PATCH] Merge --- .../minecraft/game/core/damage/DamageManager.java | 4 ++-- .../arcade/game/games/champions/ChampionsDominate.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 c61dbf23a..4e48ce420 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 @@ -533,8 +533,8 @@ public class DamageManager extends MiniPlugin if (mat.name().contains("WOOD")) damage -= 3; else if (mat.name().contains("STONE")) damage -= 2; - else if (mat.name().contains("DIAMOND")) damage -= 1; - else if (mat.name().contains("GOLD")) damage += 1; + else if (mat.name().contains("DIAMOND")) damage += 1; + else if (mat.name().contains("GOLD")) damage -= 1; event.setDamage(damage); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java index d88db6d5b..3bab9f6e6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java @@ -36,11 +36,11 @@ public class ChampionsDominate extends Domination "Collect Emeralds to get 300 Points", "Collect Resupply Chests to restock your inventory", "Customize your Class to suit your play style", - "Diamond Sword boosts Sword Skill by 1 Level", - "Diamond Axe boosts Axe Skill by 1 Level", - "Gold Weapons deal 7 damage", + "Gold Sword boosts Sword Skill by 1 Level", + "Gold Axe boosts Axe Skill by 1 Level", + "Gold Weapons deal 5 damage", "Iron Weapons deal 6 damage", - "Diamond Weapons deal 5 damage", + "Diamond Weapons deal 7 damage", };