Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fdd910e Log IOException in plugin update (#7960)
PaperMC/Paper@90836d0 1.19 Anti-Xray cleanup (#8104)
PaperMC/Paper@384d639 Fix missing redstone event call with Eigencraft redstone (#8148)
This commit is contained in:
BillyGalbreath
2022-07-18 06:49:45 -05:00
parent b5fd0447a9
commit 4951792417
7 changed files with 30 additions and 30 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix pufferfish issues
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 9e3c82e5c35ee6df68942ba505d098d7a6ae59de..96d1af76aec13b07f91c2168fbdfa8740175f3db 100644
index 32a39a150a3d2bbae95a726901f3f46363e34ecf..4094d08d478a98cb4ff13ff3274ad0d88cd46e85 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -769,7 +769,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,10 +18,10 @@ index 9e3c82e5c35ee6df68942ba505d098d7a6ae59de..96d1af76aec13b07f91c2168fbdfa874
private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index a26799f92db1699d2d5173e2e93be29273e1a317..8bae26d296eb73642fa1a2f83ec1a28fadcade0c 100644
index a2a0bc4874a031c964a5cdb5bc26494cd01351eb..817c501bdf31d8247d0d8d0743c67578184dd0fd 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -272,7 +272,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -271,7 +271,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -31,7 +31,7 @@ index a26799f92db1699d2d5173e2e93be29273e1a317..8bae26d296eb73642fa1a2f83ec1a28f
// Pufferfish start - ensure these get inlined
private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection;
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index ec23064d5a6d70508fad7cffc6126cfd6f7a62cb..b4e70dd36b426b9ca95e0a9953f1d7c89203db31 100644
index 0b08a91ae9dc73c011dbb5f517becac7d08fd1e9..6fbf26eb7da8df2f0a4158ff9f12022518ada8e3 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -136,7 +136,7 @@ public class LevelChunk extends ChunkAccess {