aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches-Unmapped/0543-Remove-armour-stand-double-add-to-world.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches-Unmapped/0543-Remove-armour-stand-double-add-to-world.patch')
-rw-r--r--Spigot-Server-Patches-Unmapped/0543-Remove-armour-stand-double-add-to-world.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/Spigot-Server-Patches-Unmapped/0543-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches-Unmapped/0543-Remove-armour-stand-double-add-to-world.patch
new file mode 100644
index 0000000000..835c6e761b
--- /dev/null
+++ b/Spigot-Server-Patches-Unmapped/0543-Remove-armour-stand-double-add-to-world.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mariell Hoversholm <[email protected]>
+Date: Fri, 14 Aug 2020 23:59:26 +0200
+Subject: [PATCH] Remove armour stand double add to world
+
+
+diff --git a/src/main/java/net/minecraft/world/item/ItemArmorStand.java b/src/main/java/net/minecraft/world/item/ItemArmorStand.java
+index dd0dc2a321f2f99cbf1060e47deec0f690d6b948..cd46df5485ebfd597ea72360a27872d46174ee19 100644
+--- a/src/main/java/net/minecraft/world/item/ItemArmorStand.java
++++ b/src/main/java/net/minecraft/world/item/ItemArmorStand.java
+@@ -53,7 +53,7 @@ public class ItemArmorStand extends Item {
+ return EnumInteractionResult.FAIL;
+ }
+
+- worldserver.addAllEntities(entityarmorstand);
++ // Paper - moved down
+ float f = (float) MathHelper.d((MathHelper.g(itemactioncontext.h() - 180.0F) + 22.5F) / 45.0F) * 45.0F;
+
+ entityarmorstand.setPositionRotation(entityarmorstand.locX(), entityarmorstand.locY(), entityarmorstand.locZ(), f, 0.0F);
+@@ -63,7 +63,7 @@ public class ItemArmorStand extends Item {
+ return EnumInteractionResult.FAIL;
+ }
+ // CraftBukkit end
+- world.addEntity(entityarmorstand);
++ worldserver.addAllEntities(entityarmorstand); // Paper - moved down
+ world.playSound((EntityHuman) null, entityarmorstand.locX(), entityarmorstand.locY(), entityarmorstand.locZ(), SoundEffects.ENTITY_ARMOR_STAND_PLACE, SoundCategory.BLOCKS, 0.75F, 0.8F);
+ }
+