Paper/nms-patches/EntityArmorStand.patch

139 Zeilen
5.6 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityArmorStand.java
+++ b/net/minecraft/server/EntityArmorStand.java
2016-05-10 13:47:39 +02:00
@@ -5,6 +5,15 @@
2015-02-15 02:24:14 +01:00
import java.util.List;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
2015-02-15 02:24:14 +01:00
+// CraftBukkit start
2015-02-15 02:48:56 +01:00
+import org.bukkit.inventory.EquipmentSlot;
2015-02-15 02:24:14 +01:00
+import org.bukkit.craftbukkit.CraftEquipmentSlot;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerArmorStandManipulateEvent;
+// CraftBukkit end
+
public class EntityArmorStand extends EntityLiving {
2017-05-14 04:00:00 +02:00
private static final Vector3f br = new Vector3f(0.0F, 0.0F, 0.0F);
2017-11-07 07:21:38 +01:00
@@ -61,6 +70,13 @@
this.setPosition(d0, d1, d2);
}
+ // CraftBukkit start - SPIGOT-3607, SPIGOT-3637
+ @Override
+ public float getBukkitYaw() {
+ return this.yaw;
+ }
+ // CraftBukkit end
+
public final void setSize(float f, float f1) {
double d0 = this.locX;
double d1 = this.locY;
@@ -364,6 +380,21 @@
2017-05-14 04:00:00 +02:00
if (itemstack1.isEmpty() || (this.bB & 1 << enumitemslot.c() + 8) == 0) {
if (!itemstack1.isEmpty() || (this.bB & 1 << enumitemslot.c() + 16) == 0) {
2015-02-15 02:24:14 +01:00
ItemStack itemstack2;
+ // CraftBukkit start
2016-02-29 22:32:46 +01:00
+ org.bukkit.inventory.ItemStack armorStandItem = CraftItemStack.asCraftMirror(itemstack1);
+ org.bukkit.inventory.ItemStack playerHeldItem = CraftItemStack.asCraftMirror(itemstack);
2015-02-15 02:24:14 +01:00
+
+ Player player = (Player) entityhuman.getBukkitEntity();
+ ArmorStand self = (ArmorStand) this.getBukkitEntity();
+
2016-02-29 22:32:46 +01:00
+ EquipmentSlot slot = CraftEquipmentSlot.getSlot(enumitemslot);
2015-02-15 02:24:14 +01:00
+ PlayerArmorStandManipulateEvent armorStandManipulateEvent = new PlayerArmorStandManipulateEvent(player,self,playerHeldItem,armorStandItem,slot);
+ this.world.getServer().getPluginManager().callEvent(armorStandManipulateEvent);
+
+ if (armorStandManipulateEvent.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
2016-11-17 02:41:03 +01:00
if (entityhuman.abilities.canInstantlyBuild && itemstack1.isEmpty() && !itemstack.isEmpty()) {
2016-02-29 22:32:46 +01:00
itemstack2 = itemstack.cloneItemStack();
2017-11-07 07:21:38 +01:00
@@ -385,14 +416,19 @@
}
public boolean damageEntity(DamageSource damagesource, float f) {
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
+ return false;
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
if (!this.world.isClientSide && !this.dead) {
if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
- this.die();
2017-05-14 04:00:00 +02:00
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
return false;
2017-05-14 04:00:00 +02:00
} else if (!this.isInvulnerable(damagesource) && !this.bA && !this.isMarker()) {
if (damagesource.isExplosion()) {
2017-05-14 04:00:00 +02:00
this.F();
- this.die();
2017-05-14 04:00:00 +02:00
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
return false;
} else if (DamageSource.FIRE.equals(damagesource)) {
if (this.isBurning()) {
2017-11-07 07:21:38 +01:00
@@ -421,7 +457,7 @@
} else if (damagesource.u()) {
2017-05-14 04:00:00 +02:00
this.H();
this.D();
- this.die();
2017-05-14 04:00:00 +02:00
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
return false;
} else {
long i = this.world.getTime();
2017-11-07 07:21:38 +01:00
@@ -432,7 +468,7 @@
} else {
this.E();
this.D();
- this.die();
2017-05-14 04:00:00 +02:00
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
}
return false;
2017-11-07 07:21:38 +01:00
@@ -460,7 +496,7 @@
f1 -= f;
if (f1 <= 0.5F) {
2017-05-14 04:00:00 +02:00
this.F();
- this.die();
2017-05-14 04:00:00 +02:00
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
} else {
this.setHealth(f1);
}
2017-11-07 07:21:38 +01:00
@@ -468,7 +504,7 @@
}
2017-05-14 04:00:00 +02:00
private void E() {
- Block.a(this.world, new BlockPosition(this), new ItemStack(Items.ARMOR_STAND));
+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(new ItemStack(Items.ARMOR_STAND))); // CraftBukkit - add to drops
2017-05-14 04:00:00 +02:00
this.F();
}
2017-11-07 07:21:38 +01:00
@@ -481,7 +517,7 @@
2017-05-14 04:00:00 +02:00
for (i = 0; i < this.by.size(); ++i) {
itemstack = (ItemStack) this.by.get(i);
if (!itemstack.isEmpty()) {
- Block.a(this.world, (new BlockPosition(this)).up(), itemstack);
+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack)); // CraftBukkit - add to drops
2017-05-14 04:00:00 +02:00
this.by.set(i, ItemStack.a);
}
}
2017-11-07 07:21:38 +01:00
@@ -489,7 +525,7 @@
2017-05-14 04:00:00 +02:00
for (i = 0; i < this.bz.size(); ++i) {
itemstack = (ItemStack) this.bz.get(i);
if (!itemstack.isEmpty()) {
- Block.a(this.world, (new BlockPosition(this)).up(), itemstack);
+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack)); // CraftBukkit - add to drops
2017-05-14 04:00:00 +02:00
this.bz.set(i, ItemStack.a);
}
}
2017-11-07 07:21:38 +01:00
@@ -601,6 +637,7 @@
}
public void killEntity() {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, drops); // CraftBukkit - call event
this.die();
}