Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
02fbcbc Add reobf mappings patch for LevelChunk#level (CraftBukkit changes type) (#6079)
2641b91 Also deobfuscate secondary stacktraces in crash reports (#6078)
cc063e1 Fix incorrect variable usage in per-player mob spawning patch (#6077)

Tuinity Changes:
4867bfb Use correct y value for snow/ice formation
361be02 Update paper
This commit is contained in:
William Blake Galbreath
2021-07-04 12:49:50 -05:00
parent 1a2d7015b0
commit 8b67a588a8
15 changed files with 57 additions and 55 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Make lightning rod range configurable
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index f94c1b943488806d1336bd28ac9e8efd9e1fedbd..84febe41f4b1bb8a7117ed4212b10388e4eff9fe 100644
index 9f37cc84cbbefd96dd64ae4c811d0257829de649..dbf9d73027320efeed5fda3a610281fd737540df 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1044,7 +1044,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -1046,7 +1046,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
return villageplacetype == PoiType.LIGHTNING_ROD;
}, (blockposition1) -> {
return blockposition1.getY() == this.getLevel().getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1;
@@ -18,7 +18,7 @@ index f94c1b943488806d1336bd28ac9e8efd9e1fedbd..84febe41f4b1bb8a7117ed4212b10388
return optional.map((blockposition1) -> {
return blockposition1.above(1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b42f87fad204dd21ba843b78c1f6710e95452a3a..505bcc6e2a3977af25c0f9de2b2477fa4657a6bd 100644
index 06a560864e43e60ad13db17c4ffdc006381f5511..9b730c8e14d4ccbb46977bd2026c466a78008ec4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -349,6 +349,7 @@ public class PurpurConfig {