mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
b62dfa0bf9
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
24 lines
934 B
Diff
24 lines
934 B
Diff
From 447e870f1658adb0b69fa54b9bd0282fb8637931 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 30 Aug 2018 20:56:26 -0400
|
|
Subject: [PATCH] Don't double add golems to world
|
|
|
|
spawnCreature adds to world now
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
|
|
index 955041e266..5f280fcab9 100644
|
|
--- a/src/main/java/net/minecraft/server/Village.java
|
|
+++ b/src/main/java/net/minecraft/server/Village.java
|
|
@@ -77,7 +77,7 @@ public class Village {
|
|
|
|
if (entityirongolem != null) {
|
|
if (entityirongolem.a((GeneratorAccess) this.a, false) && entityirongolem.a((IWorldReader) this.a)) {
|
|
- this.a.addEntity(entityirongolem);
|
|
+ //this.a.addEntity(entityirongolem); // Paper - already is in the world
|
|
return entityirongolem;
|
|
}
|
|
|
|
--
|
|
2.19.0
|
|
|