mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 17:37:45 +01:00
29 lines
1.6 KiB
Diff
29 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
||
|
|
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/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
|
||
|
|
index 73b92c8a715ce1e9bbbdde7e94a605df76979960..c9a5d3b583076cf8f2f32b12c142beb3f5e22dc0 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/ItemArmorStand.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
|
||
|
|
@@ -33,7 +33,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);
|
||
|
|
@@ -43,7 +43,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);
|
||
|
|
}
|
||
|
|
|