Player skin changes

CitizensDev · Apr 5, 2014 · df48d5f · df48d5f
1 parent 71eb3c6
commit df48d5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java
@@ -162,7 +162,8 @@ public void onSpawn() {
 
     @Override
     public void run() {
-        if (!enabled || !npc.isSpawned() || getHandle().passenger == null)
+        if (!enabled || !npc.isSpawned() || getHandle().passenger == null
+                || !(getHandle().passenger.getBukkitEntity() instanceof Player))
             return;
         controller.run((Player) getHandle().passenger.getBukkitEntity());
     }

diff --git a/src/main/java/net/citizensnpcs/trait/PlayerSkin.java b/src/main/java/net/citizensnpcs/trait/PlayerSkin.java
@@ -104,7 +104,7 @@ public void run() {
             if (entity instanceof LivingEntity) {
                 LivingEntity le = (LivingEntity) entity;
                 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
                             * 60 * 24 * 7, 1));
                 }