Fix #29
This commit is contained in:
@ -1,19 +1,31 @@
|
||||
--- ../src-base/minecraft/net/minecraft/entity/EntityLeashKnot.java
|
||||
+++ ../src-work/minecraft/net/minecraft/entity/EntityLeashKnot.java
|
||||
@@ -11,6 +11,12 @@
|
||||
@@ -2,8 +2,10 @@
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
+
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -11,6 +13,13 @@
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
+ // CraftBukkit start
|
||||
+import net.minecraft.entity.player.EntityPlayerMP;
|
||||
+import net.minecraft.network.play.server.S1BPacketEntityAttach;
|
||||
+
|
||||
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
||||
+// CraftBukkit end
|
||||
+
|
||||
public class EntityLeashKnot extends EntityHanging
|
||||
{
|
||||
private static final String __OBFID = "CL_00001548";
|
||||
@@ -84,6 +90,14 @@
|
||||
@@ -84,6 +93,14 @@
|
||||
|
||||
if (entityliving.getLeashed() && entityliving.getLeashedToEntity() == p_130002_1_)
|
||||
{
|
||||
@ -28,7 +40,7 @@
|
||||
entityliving.setLeashedToEntity(this, true);
|
||||
flag = true;
|
||||
}
|
||||
@@ -93,9 +107,12 @@
|
||||
@@ -93,9 +110,12 @@
|
||||
|
||||
if (!this.worldObj.isRemote && !flag)
|
||||
{
|
||||
@ -43,7 +55,7 @@
|
||||
{
|
||||
d0 = 7.0D;
|
||||
list = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(this.posX - d0, this.posY - d0, this.posZ - d0, this.posX + d0, this.posY + d0, this.posZ + d0));
|
||||
@@ -110,11 +127,27 @@
|
||||
@@ -110,11 +130,27 @@
|
||||
|
||||
if (entityliving.getLeashed() && entityliving.getLeashedToEntity() == this)
|
||||
{
|
||||
@ -72,3 +84,15 @@
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -154,4 +190,11 @@
|
||||
|
||||
return null;
|
||||
}
|
||||
+
|
||||
+ // Cauldron start
|
||||
+ @Override
|
||||
+ public boolean entityProjectileHook() {
|
||||
+ return true;
|
||||
+ }
|
||||
+ // Cauldron end
|
||||
}
|
||||
|
Reference in New Issue
Block a user