Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-28 20:17:50 +01:00
Code Issues Projects Releases Wiki Activity

Player skin changes

Browse Source
This commit is contained in:
fullwall 2014-04-05 15:28:39 +08:00
parent 54bd62c414
commit 99862ecf06
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/citizensnpcs/trait/Controllable.java
View File

@ -162,7 +162,8 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
@Override @Override
public void run() { public void run() {
if (!enabled || !npc.isSpawned() || getHandle().passenger == null) if (!enabled || !npc.isSpawned() || getHandle().passenger == null
|| !(getHandle().passenger.getBukkitEntity() instanceof Player))
return; return;
controller.run((Player) getHandle().passenger.getBukkitEntity()); controller.run((Player) getHandle().passenger.getBukkitEntity());
} }

2
src/main/java/net/citizensnpcs/trait/PlayerSkin.java
View File

@ -104,7 +104,7 @@ public class PlayerSkin extends Trait {
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
LivingEntity le = (LivingEntity) entity; LivingEntity le = (LivingEntity) entity;
le.setRemainingAir(20); le.setRemainingAir(20);
if (!le.hasPotionEffect(PotionEffectType.INVISIBILITY)) { if (!(le instanceof Slime) && !le.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 20 * 60 ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 20 * 60
* 60 * 24 * 7, 1)); * 60 * 24 * 7, 1));
} }