Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
6f66fa571 Fix Light Thread causing world memory leak - Fixes #4045
674230907 Improve EntityTargetLivingEntityEvent for 1.16 mobs

Tuinity Changes:
30dc21f Notify poi changes in setTypeAndDataRaw
This commit is contained in:
William Blake Galbreath
2020-08-06 20:47:38 -05:00
parent 60ce52a46b
commit d6d9539cd2
5 changed files with 41 additions and 29 deletions

View File

@@ -233,10 +233,10 @@ index 0a25523f3c..e8637244ce 100644
return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index dd5a80c769..e6c03ffc2f 100644
index 54a6a37c81..a22b78a655 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1496,6 +1496,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1500,6 +1500,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return new DifficultyDamageScaler(this.getDifficulty(), this.getDayTime(), i, f);
}