Update Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
Ben Kerllenevich
2021-08-31 07:23:46 -04:00
parent 64547876a0
commit 19293aabc5
36 changed files with 113 additions and 113 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 750e1900204a1d8717ec78ab2a5863a464e84431..f959fab7c941505fcb39b116c05a9e9cd401b090 100644
index 38f4c77355f3a63bf1da1ced5df49512b10a424d..1ea18770c65583e2ed604eb15d15067a638a33a2 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory;
@@ -27,7 +27,7 @@ index 750e1900204a1d8717ec78ab2a5863a464e84431..f959fab7c941505fcb39b116c05a9e9c
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.raid.Raid;
import net.minecraft.world.entity.raid.Raids;
@@ -131,6 +134,8 @@ import net.minecraft.world.level.gameevent.GameEvent;
@@ -130,6 +133,8 @@ import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.level.gameevent.GameEventListenerRegistrar;
import net.minecraft.world.level.gameevent.vibrations.VibrationPath;
import net.minecraft.world.level.levelgen.Heightmap;
@@ -36,7 +36,7 @@ index 750e1900204a1d8717ec78ab2a5863a464e84431..f959fab7c941505fcb39b116c05a9e9c
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.StructureStart;
@@ -506,7 +511,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -505,7 +510,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.dragonParts = new Int2ObjectOpenHashMap();
this.tickTime = flag1;
this.server = minecraftserver;