From e8d2c523e49e82447e9d4598a2d617b50afa92fc Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 16 Mar 2016 11:26:29 -0700 Subject: [PATCH] Decrease teleport cooldown for non-living entities (#671) --- .../java/WayofTime/bloodmagic/ritual/portal/Teleports.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index a7250e60..1d67a2d9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual.portal; import lombok.Getter; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; @@ -157,14 +158,13 @@ public class Teleports teleportedEntity.forceSpawn = true; newWorldServer.spawnEntityInWorld(teleportedEntity); teleportedEntity.setWorld(newWorldServer); - teleportedEntity.timeUntilPortal = 150; + teleportedEntity.timeUntilPortal = teleportedEntity instanceof EntityPlayer ? 150 : 20; } oldWorldServer.resetUpdateEntityTick(); newWorldServer.resetUpdateEntityTick(); } - entity.timeUntilPortal = 150; - + entity.timeUntilPortal = entity instanceof EntityLiving ? 150 : 20; newWorldServer.playSoundEffect(x, y, z, "mob.endermen.portal", 1.0F, 1.0F); } }