Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
82792f883 [Auto] Updated Upstream (CraftBukkit)
899bc53b7 Updated Upstream (Bukkit/CraftBukkit) (#4779)
This commit is contained in:
BillyGalbreath
2020-11-18 21:12:53 -06:00
parent 56569681b4
commit b6f937317f
7 changed files with 31 additions and 29 deletions

View File

@@ -221,10 +221,10 @@ index 4e3f01bc7..ac1ea2f0c 100644
}
}
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index beaea041d..ce8834980 100644
index 6c1540998..8eadfae52 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -386,6 +386,7 @@ public final class SpawnerCreature {
@@ -387,6 +387,7 @@ public final class SpawnerCreature {
return new BlockPosition(i, l, j);
}
@@ -233,7 +233,7 @@ index beaea041d..ce8834980 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 ab8fad689..baa8d23a9 100644
index ee56f23d0..8f6948f52 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1564,6 +1564,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {