Update to 1.16.4 ^_^

This commit is contained in:
William Blake Galbreath
2020-11-03 01:27:33 -06:00
parent 0fa478d031
commit 03654a6880
58 changed files with 472 additions and 477 deletions

View File

@@ -18,10 +18,10 @@ index 15af5927f3..c9c2e9774a 100644
public PacketPlayOutUpdateTime() {}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0fb41962c8..86b6442292 100644
index 37423fd9c4..8f6f42ef52 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -90,6 +90,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
private final EnderDragonBattle dragonBattle;
private final StructureManager structureManager;
private final boolean Q;
@@ -29,7 +29,7 @@ index 0fb41962c8..86b6442292 100644
// CraftBukkit start
@@ -371,6 +372,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -375,6 +376,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.getServer().addWorld(this.getWorld()); // CraftBukkit
this.asyncChunkTaskManager = new com.destroystokyo.paper.io.chunk.ChunkTaskManager(this); // Paper
@@ -37,7 +37,7 @@ index 0fb41962c8..86b6442292 100644
}
// Tuinity start - optimise collision
@@ -1008,7 +1010,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1012,7 +1014,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.nextTickListBlock.nextTick(); // Paper
this.nextTickListFluid.nextTick(); // Paper
this.worldDataServer.u().a(this.server, i);
@@ -60,7 +60,7 @@ index 0fb41962c8..86b6442292 100644
this.setDayTime(this.worldData.getDayTime() + 1L);
}
@@ -1017,6 +1033,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1021,6 +1037,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void setDayTime(long i) {
this.worldDataServer.setDayTime(i);
@@ -74,7 +74,7 @@ index 0fb41962c8..86b6442292 100644
public void doMobSpawning(boolean flag, boolean flag1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fd07c9f213..3f7c2d7e23 100644
index 8e97eb92dd..013f1cfb48 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,6 +116,13 @@ public class PurpurWorldConfig {