mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-04 01:39:54 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
24 lines
934 B
Diff
24 lines
934 B
Diff
From 55a1e8faecf44ded04ae4ba2089134bcf7b4ee46 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 0414f003a5..d92ef03661 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
|
|
|