Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-22 14:28:09 +01:00
195 Zeilen
8.2 KiB
Diff
195 Zeilen
8.2 KiB
Diff
--- a/net/minecraft/server/EntityInsentient.java
|
|
+++ b/net/minecraft/server/EntityInsentient.java
|
|
@@ -4,6 +4,15 @@
|
|
import java.util.List;
|
|
import java.util.UUID;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
|
+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 {
|
|
|
|
public int a_;
|
|
@@ -13,8 +22,8 @@
|
|
protected ControllerJump g;
|
|
private EntityAIBodyControl b;
|
|
protected NavigationAbstract navigation;
|
|
- public final PathfinderGoalSelector goalSelector;
|
|
- public final PathfinderGoalSelector targetSelector;
|
|
+ public PathfinderGoalSelector goalSelector; // PAIL: -final
|
|
+ public PathfinderGoalSelector targetSelector; // PAIL: -final
|
|
private EntityLiving goalTarget;
|
|
private EntitySenses bk;
|
|
private ItemStack[] equipment = new ItemStack[5];
|
|
@@ -40,6 +49,9 @@
|
|
this.dropChances[i] = 0.085F;
|
|
}
|
|
|
|
+ // CraftBukkit start - default persistance to type's persistance value
|
|
+ this.persistent = !isTypeNotPersistent();
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
protected void initAttributes() {
|
|
@@ -76,7 +88,37 @@
|
|
}
|
|
|
|
public void setGoalTarget(EntityLiving entityliving) {
|
|
+ // CraftBukkit start - fire event
|
|
+ setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
|
|
+ }
|
|
+
|
|
+ public void setGoalTarget(EntityLiving entityliving, EntityTargetEvent.TargetReason reason, boolean fireEvent) {
|
|
+ if (getGoalTarget() == entityliving) return;
|
|
+ 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;
|
|
+ }
|
|
+
|
|
+ if (event.getTarget() != null) {
|
|
+ entityliving = ((CraftLivingEntity) event.getTarget()).getHandle();
|
|
+ } else {
|
|
+ entityliving = null;
|
|
+ }
|
|
+ }
|
|
this.goalTarget = entityliving;
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public boolean a(Class<? extends EntityLiving> oclass) {
|
|
@@ -168,6 +210,7 @@
|
|
return null;
|
|
}
|
|
|
|
+ protected ItemStack headDrop = null; // CraftBukkit
|
|
protected void dropDeathLoot(boolean flag, int i) {
|
|
Item item = this.getLoot();
|
|
|
|
@@ -183,6 +226,12 @@
|
|
}
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ if (headDrop != null) {
|
|
+ this.a(headDrop, 0.0F);
|
|
+ headDrop = null;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public void b(NBTTagCompound nbttagcompound) {
|
|
@@ -235,11 +284,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.j(nbttagcompound.getBoolean("CanPickUpLoot"));
|
|
+ boolean data = nbttagcompound.getBoolean("CanPickUpLoot");
|
|
+ if (isLevelAtLeast(nbttagcompound, 1) || data) {
|
|
+ this.j(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;
|
|
|
|
@@ -380,11 +438,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;
|
|
@@ -707,6 +765,12 @@
|
|
|
|
public final boolean e(EntityHuman entityhuman) {
|
|
if (this.cc() && this.getLeashHolder() == entityhuman) {
|
|
+ // CraftBukkit start - fire PlayerUnleashEntityEvent
|
|
+ if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(1, this, this.getLeashHolder()));
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.unleash(true, !entityhuman.abilities.canInstantlyBuild);
|
|
return true;
|
|
} else {
|
|
@@ -714,12 +778,24 @@
|
|
|
|
if (itemstack != null && itemstack.getItem() == Items.LEAD && this.cb()) {
|
|
if (!(this instanceof EntityTameableAnimal) || !((EntityTameableAnimal) this).isTamed()) {
|
|
+ // CraftBukkit start - fire PlayerLeashEntityEvent
|
|
+ if (CraftEventFactory.callPlayerLeashEntityEvent(this, entityhuman, entityhuman).isCancelled()) {
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(1, this, this.getLeashHolder()));
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.setLeashHolder(entityhuman, true);
|
|
--itemstack.count;
|
|
return true;
|
|
}
|
|
|
|
if (((EntityTameableAnimal) this).e((EntityLiving) entityhuman)) {
|
|
+ // CraftBukkit start - fire PlayerLeashEntityEvent
|
|
+ if (CraftEventFactory.callPlayerLeashEntityEvent(this, entityhuman, entityhuman).isCancelled()) {
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(1, this, this.getLeashHolder()));
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.setLeashHolder(entityhuman, true);
|
|
--itemstack.count;
|
|
return true;
|
|
@@ -741,10 +817,12 @@
|
|
|
|
if (this.bo) {
|
|
if (!this.isAlive()) {
|
|
+ this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.PLAYER_UNLEASH)); // CraftBukkit
|
|
this.unleash(true, true);
|
|
}
|
|
|
|
if (this.bp == null || this.bp.dead) {
|
|
+ this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.HOLDER_GONE)); // CraftBukkit
|
|
this.unleash(true, true);
|
|
}
|
|
}
|
|
@@ -811,6 +889,7 @@
|
|
|
|
this.bp = entityleash;
|
|
} else {
|
|
+ this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
|
|
this.unleash(false, true);
|
|
}
|
|
}
|