Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
5fd19303f Call PreCreatureSpawnEvent for more spawn reasons (#5201)
This commit is contained in:
jmp
2021-02-20 14:53:09 -08:00
parent c98cc6be91
commit 90f67f87de
15 changed files with 23 additions and 20 deletions

View File

@@ -65,7 +65,7 @@ index ecff0657e5666ddc2e6a5c3111bfb2b8dd2b78d3..3ee8d31c453105eca7b96bede39a9ebb
// Paper end
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index de9ea6770b8afc5e1020bef04ac6cca93b6b420c..21d0570a59240e955ff148bac0226b220a7dec36 100644
index c8b7ab17d53c302698fa7f9850c18e474832a585..f7a673544e6dccbed33359973ce59e8f25000550 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -166,7 +166,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation