EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Summon amount limits and new ability

Browse Source
This commit is contained in:
TfT_02
2013-09-17 00:55:38 +02:00
parent eda38cba66
commit c31281971c
13 changed files with 111 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/util/Permissions.java
View File

@ -184,6 +184,7 @@ public final class Permissions {
/* TAMING */
public static boolean callOfTheWild(Permissible permissible, EntityType type) { return permissible.hasPermission("mcmmo.ability.taming.callofthewild." + type.toString().toLowerCase()); }
public static boolean renamePets(Permissible permissible) { return permissible.hasPermission("mcmmo.ability.taming.callofthewild.renamepets"); }
/* UNARMED */
public static boolean berserk(Permissible permissible) { return permissible.hasPermission("mcmmo.ability.unarmed.berserk"); }

2
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -147,6 +147,8 @@ public final class CombatUtils {
tamingManager.fastFoodService(wolf, event.getDamage());
}
tamingManager.pummel(target, wolf);
if (tamingManager.canUseSharpenedClaws()) {
finalDamage += tamingManager.sharpenedClaws();
}

8
src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java
View File

@ -34,8 +34,12 @@ public final class ParticleEffectUtils {
return;
}
Location location = player.getEyeLocation();
World world = player.getWorld();
playSmokeEffect(player);
}
public static void playSmokeEffect(LivingEntity livingEntity) {
Location location = livingEntity.getEyeLocation();
World world = livingEntity.getWorld();
// Have to do it this way, because not all block directions are valid for smoke
world.playEffect(location, Effect.SMOKE, BlockFace.SOUTH_EAST);