geforkt von Mirrors/Paper
224 Zeilen
9.6 KiB
Diff
224 Zeilen
9.6 KiB
Diff
--- a/net/minecraft/server/EntityInsentient.java
|
|
+++ b/net/minecraft/server/EntityInsentient.java
|
|
@@ -10,6 +10,18 @@
|
|
import java.util.UUID;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
|
+import org.bukkit.entity.LivingEntity;
|
|
+import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
|
+import org.bukkit.event.entity.EntityPickupItemEvent;
|
|
+import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
|
|
+import org.bukkit.event.entity.EntityTargetEvent;
|
|
+import org.bukkit.event.entity.EntityUnleashEvent;
|
|
+import org.bukkit.event.entity.EntityUnleashEvent.UnleashReason;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class EntityInsentient extends EntityLiving {
|
|
|
|
private static final DataWatcherObject<Byte> a = DataWatcher.a(EntityInsentient.class, DataWatcherRegistry.a);
|
|
@@ -28,7 +40,7 @@
|
|
public float[] dropChanceHand;
|
|
private final NonNullList<ItemStack> bE;
|
|
public float[] dropChanceArmor;
|
|
- public boolean canPickUpLoot;
|
|
+ // public boolean canPickUpLoot; // CraftBukkit - moved up to EntityLiving
|
|
public boolean persistent;
|
|
private final Map<PathType, Float> bH;
|
|
public MinecraftKey lootTableKey;
|
|
@@ -58,6 +70,9 @@
|
|
this.n();
|
|
}
|
|
|
|
+ // CraftBukkit start - default persistance to type's persistance value
|
|
+ this.persistent = !isTypeNotPersistent();
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
protected void n() {}
|
|
@@ -111,7 +126,38 @@
|
|
}
|
|
|
|
public void setGoalTarget(@Nullable EntityLiving entityliving) {
|
|
+ // CraftBukkit start - fire event
|
|
+ setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
|
|
+ }
|
|
+
|
|
+ public boolean setGoalTarget(EntityLiving entityliving, EntityTargetEvent.TargetReason reason, boolean fireEvent) {
|
|
+ if (getGoalTarget() == entityliving) return false;
|
|
+ if (fireEvent) {
|
|
+ if (reason == EntityTargetEvent.TargetReason.UNKNOWN && getGoalTarget() != null && entityliving == null) {
|
|
+ reason = getGoalTarget().isAlive() ? EntityTargetEvent.TargetReason.FORGOT_TARGET : EntityTargetEvent.TargetReason.TARGET_DIED;
|
|
+ }
|
|
+ if (reason == EntityTargetEvent.TargetReason.UNKNOWN) {
|
|
+ world.getServer().getLogger().log(java.util.logging.Level.WARNING, "Unknown target reason, please report on the issue tracker", new Exception());
|
|
+ }
|
|
+ CraftLivingEntity ctarget = null;
|
|
+ if (entityliving != null) {
|
|
+ ctarget = (CraftLivingEntity) entityliving.getBukkitEntity();
|
|
+ }
|
|
+ EntityTargetLivingEntityEvent event = new EntityTargetLivingEntityEvent(this.getBukkitEntity(), ctarget, reason);
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ if (event.getTarget() != null) {
|
|
+ entityliving = ((CraftLivingEntity) event.getTarget()).getHandle();
|
|
+ } else {
|
|
+ entityliving = null;
|
|
+ }
|
|
+ }
|
|
this.goalTarget = entityliving;
|
|
+ return true;
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public boolean b(Class<? extends EntityLiving> oclass) {
|
|
@@ -337,11 +383,20 @@
|
|
|
|
public void a(NBTTagCompound nbttagcompound) {
|
|
super.a(nbttagcompound);
|
|
+
|
|
+ // CraftBukkit start - If looting or persistence is false only use it if it was set after we started using it
|
|
if (nbttagcompound.hasKeyOfType("CanPickUpLoot", 1)) {
|
|
- this.p(nbttagcompound.getBoolean("CanPickUpLoot"));
|
|
+ boolean data = nbttagcompound.getBoolean("CanPickUpLoot");
|
|
+ if (isLevelAtLeast(nbttagcompound, 1) || data) {
|
|
+ this.p(data);
|
|
+ }
|
|
}
|
|
|
|
- this.persistent = nbttagcompound.getBoolean("PersistenceRequired");
|
|
+ boolean data = nbttagcompound.getBoolean("PersistenceRequired");
|
|
+ if (isLevelAtLeast(nbttagcompound, 1) || data) {
|
|
+ this.persistent = data;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
NBTTagList nbttaglist;
|
|
int i;
|
|
|
|
@@ -395,6 +450,11 @@
|
|
protected MinecraftKey getDefaultLootTable() {
|
|
return null;
|
|
}
|
|
+ // CraftBukkit - start
|
|
+ public MinecraftKey getLootTable() {
|
|
+ return getDefaultLootTable();
|
|
+ }
|
|
+ // CraftBukkit - end
|
|
|
|
protected void a(boolean flag, int i, DamageSource damagesource) {
|
|
MinecraftKey minecraftkey = this.lootTableKey;
|
|
@@ -471,11 +531,21 @@
|
|
ItemStack itemstack1 = this.getEquipment(enumitemslot);
|
|
boolean flag = this.a(itemstack, itemstack1, enumitemslot);
|
|
|
|
- if (flag && this.d(itemstack)) {
|
|
+ // CraftBukkit start
|
|
+ boolean canPickup = flag && this.d(itemstack);
|
|
+
|
|
+ EntityPickupItemEvent entityEvent = new EntityPickupItemEvent((LivingEntity) getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity(), 0);
|
|
+ entityEvent.setCancelled(!canPickup);
|
|
+ this.world.getServer().getPluginManager().callEvent(entityEvent);
|
|
+ canPickup = !entityEvent.isCancelled();
|
|
+ if (canPickup) {
|
|
+ // CraftBukkit end
|
|
double d0 = (double) this.c(enumitemslot);
|
|
|
|
if (!itemstack1.isEmpty() && (double) (this.random.nextFloat() - 0.1F) < d0) {
|
|
+ this.forceDrops = true; // CraftBukkit
|
|
this.a_(itemstack1);
|
|
+ this.forceDrops = false; // CraftBukkit
|
|
}
|
|
|
|
this.setSlot(enumitemslot, itemstack);
|
|
@@ -554,11 +624,11 @@
|
|
double d2 = entityhuman.locZ - this.locZ;
|
|
double d3 = d0 * d0 + d1 * d1 + d2 * d2;
|
|
|
|
- if (this.isTypeNotPersistent() && d3 > 16384.0D) {
|
|
+ if (d3 > 16384.0D) { // CraftBukkit - remove isTypeNotPersistent() check
|
|
this.die();
|
|
}
|
|
|
|
- if (this.ticksFarFromPlayer > 600 && this.random.nextInt(800) == 0 && d3 > 1024.0D && this.isTypeNotPersistent()) {
|
|
+ if (this.ticksFarFromPlayer > 600 && this.random.nextInt(800) == 0 && d3 > 1024.0D) { // CraftBukkit - remove isTypeNotPersistent() check
|
|
this.die();
|
|
} else if (d3 < 1024.0D) {
|
|
this.ticksFarFromPlayer = 0;
|
|
@@ -932,12 +1002,24 @@
|
|
|
|
public final boolean b(EntityHuman entityhuman, EnumHand enumhand) {
|
|
if (this.isLeashed() && this.getLeashHolder() == entityhuman) {
|
|
+ // CraftBukkit start - fire PlayerUnleashEntityEvent
|
|
+ if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.unleash(true, !entityhuman.abilities.canInstantlyBuild);
|
|
return true;
|
|
} else {
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
|
|
|
if (itemstack.getItem() == Items.LEAD && this.a(entityhuman)) {
|
|
+ // CraftBukkit start - fire PlayerLeashEntityEvent
|
|
+ if (CraftEventFactory.callPlayerLeashEntityEvent(this, entityhuman, entityhuman).isCancelled()) {
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.setLeashHolder(entityhuman, true);
|
|
itemstack.subtract(1);
|
|
return true;
|
|
@@ -958,10 +1040,12 @@
|
|
|
|
if (this.bK) {
|
|
if (!this.isAlive()) {
|
|
+ this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.PLAYER_UNLEASH)); // CraftBukkit
|
|
this.unleash(true, true);
|
|
}
|
|
|
|
if (this.leashHolder == null || this.leashHolder.dead) {
|
|
+ this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.HOLDER_GONE)); // CraftBukkit
|
|
this.unleash(true, true);
|
|
}
|
|
}
|
|
@@ -972,7 +1056,9 @@
|
|
this.bK = false;
|
|
this.leashHolder = null;
|
|
if (!this.world.isClientSide && flag1) {
|
|
+ this.forceDrops = true; // CraftBukkit
|
|
this.a((IMaterial) Items.LEAD);
|
|
+ this.forceDrops = false; // CraftBukkit
|
|
}
|
|
|
|
if (!this.world.isClientSide && flag && this.world instanceof WorldServer) {
|
|
@@ -1042,6 +1128,7 @@
|
|
|
|
this.setLeashHolder(entityleash, true);
|
|
} else {
|
|
+ this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
|
|
this.unleash(false, true);
|
|
}
|
|
}
|
|
@@ -1137,7 +1224,14 @@
|
|
int j = EnchantmentManager.getFireAspectEnchantmentLevel(this);
|
|
|
|
if (j > 0) {
|
|
- entity.setOnFire(j * 4);
|
|
+ // CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item
|
|
+ EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), j * 4);
|
|
+ org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
|
|
+
|
|
+ if (!combustEvent.isCancelled()) {
|
|
+ entity.setOnFire(combustEvent.getDuration(), false);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
if (entity instanceof EntityHuman) {
|