JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

This commit is contained in:
Chiss 2014-04-21 08:47:07 +10:00
parent 845d45bd4d
commit 3281eb2ed7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
View File

@ -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);
}

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
View File

@ -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",
};