Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement Leash API. Adds BUKKIT-4459, BUKKIT-4583

Browse Source
This commit is contained in:
T00thpick1
2013-07-31 17:35:16 -04:00
committed by Wesley Wolfe
parent f7ca953ff1
commit 54672a75f6
9 changed files with 156 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/net/minecraft/server/EntityLeash.java
View File

@@ -3,6 +3,8 @@ package net.minecraft.server;
import java.util.Iterator;
import java.util.List;
import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
public class EntityLeash extends EntityHanging {
public EntityLeash(World world) {
@@ -55,6 +57,12 @@ public class EntityLeash extends EntityHanging {
while (iterator.hasNext()) {
entityinsentient = (EntityInsentient) iterator.next();
if (entityinsentient.bH() && entityinsentient.bI() == entityhuman) {
// CraftBukkit start
if (CraftEventFactory.callPlayerLeashEntityEvent(entityinsentient, this, entityhuman).isCancelled()) {
((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet39AttachEntity(1, entityinsentient, entityinsentient.bI()));
continue;
}
// CraftBukkit end
entityinsentient.b(this, true);
flag = true;
}
@@ -63,8 +71,11 @@ public class EntityLeash extends EntityHanging {
}
if (!this.world.isStatic && !flag) {
this.die();
if (entityhuman.abilities.canInstantlyBuild) {
// CraftBukkit start - Move below
// this.die();
boolean die = true;
// CraftBukkit end
if (true || entityhuman.abilities.canInstantlyBuild) { // CraftBukkit - Process for non-creative as well
d0 = 7.0D;
list = this.world.a(EntityInsentient.class, AxisAlignedBB.a().a(this.locX - d0, this.locY - d0, this.locZ - d0, this.locX + d0, this.locY + d0, this.locZ + d0));
if (list != null) {
@@ -73,11 +84,22 @@ public class EntityLeash extends EntityHanging {
while (iterator.hasNext()) {
entityinsentient = (EntityInsentient) iterator.next();
if (entityinsentient.bH() && entityinsentient.bI() == this) {
entityinsentient.a(true, false);
// CraftBukkit start
if (CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, entityhuman).isCancelled()) {
die = false;
continue;
}
entityinsentient.a(true, !entityhuman.abilities.canInstantlyBuild); // false -> survival mode boolean
// CraftBukkit end
}
}
}
}
// CraftBukkit start
if (die) {
this.die();
}
// CraftBukkit end
}
return true;