From 921a000994003ca5212bd8c6fe13108cb92efe91 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 23 Jun 2021 16:46:21 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: a7cddc4 Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965) b1f6e26 Fix mobs not burning from summon command (#5961) 4e2f0be Refactor Anti-Xray and make some fixes to it (#5938) d50cc01 Make gradle take build number from env vars and add git build info (#5890) --- gradle.properties | 2 +- patches/api/0009-Bring-back-server-name.patch | 4 +-- patches/api/0012-Lagging-threshold.patch | 4 +-- ...on-change-for-adventure-deprecations.patch | 16 ++++----- patches/server/0001-Rebrand.patch | 14 +++----- patches/server/0002-Purpur-config-files.patch | 4 +-- patches/server/0003-Ridables.patch | 14 ++++---- ...ed-to-crystals-and-crystals-shoot-ph.patch | 4 +-- .../server/0086-Phantoms-burn-in-light.patch | 6 ++-- ...ggling-special-MobSpawners-per-world.patch | 6 ++-- ...204-API-for-any-mob-to-burn-daylight.patch | 33 ++++++++++--------- ...ake-lightning-rod-range-configurable.patch | 8 ++--- scripts/upstreamCommit.sh | 0 13 files changed, 56 insertions(+), 59 deletions(-) create mode 100644 scripts/upstreamCommit.sh diff --git a/gradle.properties b/gradle.properties index c65aa4a9d..5da26b152 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version=1.17-R0.1-SNAPSHOT mcVersion=1.17 packageVersion=1_17_R1 -paperCommit=28aacb44ddccf0c072a76ad550b34455712041e9 +paperCommit=d50cc01b0830f0156942ef2378a6f6c5849670c2 org.gradle.parallel=true org.gradle.vfs.watch=false diff --git a/patches/api/0009-Bring-back-server-name.patch b/patches/api/0009-Bring-back-server-name.patch index 2d83cdd77..23b478a37 100644 --- a/patches/api/0009-Bring-back-server-name.patch +++ b/patches/api/0009-Bring-back-server-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index e8414592b3afeb1e5db2b817b8fb7c13e073b9aa..281c5a72cf59dd5cb3dee47541641483d434aeb0 100644 +index b5158151960db5c474b3aaa24bfa428e2a158fd9..d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1963,4 +1963,15 @@ public final class Bukkit { +@@ -1982,4 +1982,15 @@ public final class Bukkit { public static Server.Spigot spigot() { return server.spigot(); } diff --git a/patches/api/0012-Lagging-threshold.patch b/patches/api/0012-Lagging-threshold.patch index 724b127c2..9098b4cfe 100644 --- a/patches/api/0012-Lagging-threshold.patch +++ b/patches/api/0012-Lagging-threshold.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 281c5a72cf59dd5cb3dee47541641483d434aeb0..a60c8bd89d14e47d3243307241458e907249a99b 100644 +index d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98..047b6b3d037ccdc9c83d8f46d5469884f4811717 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1973,5 +1973,14 @@ public final class Bukkit { +@@ -1992,5 +1992,14 @@ public final class Bukkit { public static String getServerName() { return server.getServerName(); } diff --git a/patches/api/0037-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0037-Conflict-on-change-for-adventure-deprecations.patch index 68275c11a..ce9070162 100644 --- a/patches/api/0037-Conflict-on-change-for-adventure-deprecations.patch +++ b/patches/api/0037-Conflict-on-change-for-adventure-deprecations.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Conflict on change for adventure deprecations diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0acf61b19 100644 +index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff15333036e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -303,7 +303,7 @@ public final class Bukkit { +@@ -322,7 +322,7 @@ public final class Bukkit { * @return the number of players * @deprecated in favour of {@link Server#broadcast(net.kyori.adventure.text.Component)} */ @@ -17,7 +17,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0 public static int broadcastMessage(@NotNull String message) { return server.broadcastMessage(message); } -@@ -947,7 +947,7 @@ public final class Bukkit { +@@ -966,7 +966,7 @@ public final class Bukkit { * @return number of message recipients * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)} */ @@ -26,7 +26,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0 public static int broadcast(@NotNull String message, @NotNull String permission) { return server.broadcast(message, permission); } -@@ -1224,7 +1224,7 @@ public final class Bukkit { +@@ -1243,7 +1243,7 @@ public final class Bukkit { * * @see InventoryType#isCreatable() */ @@ -35,7 +35,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0 @NotNull public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) { return server.createInventory(owner, type, title); -@@ -1274,7 +1274,7 @@ public final class Bukkit { +@@ -1293,7 +1293,7 @@ public final class Bukkit { * @throws IllegalArgumentException if the size is not a multiple of 9 * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)} */ @@ -44,7 +44,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0 @NotNull public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException { return server.createInventory(owner, size, title); -@@ -1301,7 +1301,7 @@ public final class Bukkit { +@@ -1320,7 +1320,7 @@ public final class Bukkit { * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)} */ @NotNull @@ -53,7 +53,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0 public static Merchant createMerchant(@Nullable String title) { return server.createMerchant(title); } -@@ -1390,7 +1390,7 @@ public final class Bukkit { +@@ -1409,7 +1409,7 @@ public final class Bukkit { * @deprecated in favour of {@link #motd()} */ @NotNull @@ -62,7 +62,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0 public static String getMotd() { return server.getMotd(); } -@@ -1412,7 +1412,7 @@ public final class Bukkit { +@@ -1431,7 +1431,7 @@ public final class Bukkit { * @deprecated in favour of {@link #shutdownMessage()} */ @Nullable diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 6cb78e15d..8f0fd0405 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index f427c6f5adf20f9e1b1fa4ab56041506d8240c92..ec3f43392fc844cd3e327cdf73f6cd3396ae2238 100644 +index 39beb0331282b297f4f3857560d24ce6a616210d..be56806edc040b941514e0010ca7082b70f2c8a8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,8 +30,8 @@ repositories { @@ -15,7 +15,7 @@ index f427c6f5adf20f9e1b1fa4ab56041506d8240c92..ec3f43392fc844cd3e327cdf73f6cd33 - implementation(project(":Paper-API")) - implementation(project(":Paper-MojangAPI")) + implementation(project(":Purpur-API")) // Purpur -+ implementation("com.destroystokyo.paper:paper-mojangapi:1.16.5-R0.1-SNAPSHOT") // Purpur ++ implementation("com.destroystokyo.paper:paper-mojangapi:1.17-R0.1-SNAPSHOT") // Purpur // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") @@ -27,20 +27,16 @@ index f427c6f5adf20f9e1b1fa4ab56041506d8240c92..ec3f43392fc844cd3e327cdf73f6cd33 implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning -@@ -77,10 +78,11 @@ tasks.jar { - manifest { - val git = Git(rootProject.layout.projectDirectory.path) - val gitHash = git("rev-parse", "HEAD").getText().substring(0, 7) -+ val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" // Purpur +@@ -82,7 +83,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", -- "Implementation-Version" to "git-Paper-\"$gitHash\"", +- "Implementation-Version" to "git-Paper-$implementationVersion", + "Implementation-Version" to "git-Purpur-$implementationVersion", // Purpur "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -174,7 +176,7 @@ tasks.test { +@@ -178,7 +179,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch index 37d46ac67..07cd180ac 100644 --- a/patches/server/0002-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -142,7 +142,7 @@ index 4fd030ef9537d9b31c6167d73349f4c4a6b33a15..d708e210dc605ce4dca845292532dd17 public void sendMessage(Component message, UUID sender) {} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 4bf799db871243b07eea57ec7744cf6dc2628645..aa9bf40aa937acbda8cfb821666d466b1945e8a0 100644 +index 1c171599dbde44389013dc08ca8263742d58d721..837b5ba4a0f3608edfb32812b4eab966f5a722ee 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -166,6 +166,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -155,7 +155,7 @@ index 4bf799db871243b07eea57ec7744cf6dc2628645..aa9bf40aa937acbda8cfb821666d466b public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; @@ -198,6 +200,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { - protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, final DimensionType dimensionmanager, Supplier supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper + protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, final DimensionType dimensionmanager, Supplier supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Anti-Xray - Pass executor this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper + this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName())); // Purpur diff --git a/patches/server/0003-Ridables.patch b/patches/server/0003-Ridables.patch index 0b0330c57..e3fa3ee6b 100644 --- a/patches/server/0003-Ridables.patch +++ b/patches/server/0003-Ridables.patch @@ -34,7 +34,7 @@ index 4690a1c926dd695c98ac8012f271e1a71a0d3d6d..4aee3582f54a91191860108450a0a0dc this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 14bea212adbfa341ca6080a01f87b51891808d2a..56ec19abc2fa4b63eb93e1ca54c3b3c4c36ba88c 100644 +index 87b3eee23441717660aa6bb81248986cb7ef2fb4..76f72a8fe151cb9f4c5be38ec8f68790a3b9bfef 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -201,6 +201,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -2687,7 +2687,7 @@ index 1c8f6863b976cfcb559de9b3e3cf9292831166ee..68c5609845617bf5aeb82ea4e3a88bdc @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java -index c54a37516ef1d8a76f7161917bf448127cd98603..af1a3c67c9e094fd5cc5d84600cc670aea055f69 100644 +index cd75f895b6818fbb7ed4b0ef3df873f264bb2d1b..74f4f8e1c9faef3b50fa817ca3dfbb6b19b1622d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java @@ -69,12 +69,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo @@ -3418,7 +3418,7 @@ index 130205f0d101debaa74c1172fb80863e6fa0ebe1..7d39f25734f2c52b11931e141524acd2 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index 67f2d2f45138578646920ccae5b455a842a7b9e8..60bfeb0e5a667899a02fb59c13d637d87416e483 100644 +index 39291a0cea465613733a905141b584f05e597b4c..61aff98a7b56eab6a43ddc9f07618cbbedb6b77d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -61,6 +61,59 @@ public class Phantom extends FlyingMob implements Enemy { @@ -3502,7 +3502,7 @@ index 67f2d2f45138578646920ccae5b455a842a7b9e8..60bfeb0e5a667899a02fb59c13d637d8 this.setSecondsOnFire(8); } -@@ -263,7 +318,7 @@ public class Phantom extends FlyingMob implements Enemy { +@@ -265,7 +320,7 @@ public class Phantom extends FlyingMob implements Enemy { private AttackPhase() {} } @@ -3511,7 +3511,7 @@ index 67f2d2f45138578646920ccae5b455a842a7b9e8..60bfeb0e5a667899a02fb59c13d637d8 private float speed = 0.1F; -@@ -271,8 +326,19 @@ public class Phantom extends FlyingMob implements Enemy { +@@ -273,8 +328,19 @@ public class Phantom extends FlyingMob implements Enemy { super(entity); } @@ -3532,7 +3532,7 @@ index 67f2d2f45138578646920ccae5b455a842a7b9e8..60bfeb0e5a667899a02fb59c13d637d8 if (Phantom.this.horizontalCollision) { Phantom.this.setYRot(Phantom.this.getYRot() + 180.0F); this.speed = 0.1F; -@@ -318,14 +384,20 @@ public class Phantom extends FlyingMob implements Enemy { +@@ -320,14 +386,20 @@ public class Phantom extends FlyingMob implements Enemy { } } @@ -4517,7 +4517,7 @@ index 69f439851fe1ff07d827eaed274940a5783d5f6c..07853aff3d42ce50799406ee1c14389b Projectile(EntityType type, Level world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 74fc4fc2216cf82e1546ef3d567f2750b1240df1..c90dda3d62dab896f68481000c0b6db1426bc461 100644 +index 7c5ecdbd5a05ae07a440cadf79d59a439e4db524..bd0807e5647ad4745fa585bf7e6c853239cdd271 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -127,4 +127,9 @@ public class PurpurConfig { diff --git a/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 9ee6105bd..e4db60393 100644 --- a/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -73,7 +73,7 @@ index b643a2449e329560c936c0a06fb4cc494d0737a7..92e65f3fbc8f5d77bb8cc31e7a7780c2 @Override protected void addAdditionalSaveData(CompoundTag nbt) { diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index 359f5d01d144121e0ea129aebc45b3e796c16bf7..ddd48367c37d3ca3472fc9a8730f71f2e96743c2 100644 +index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc173677b01081 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -50,6 +50,7 @@ public class Phantom extends FlyingMob implements Enemy { @@ -132,7 +132,7 @@ index 359f5d01d144121e0ea129aebc45b3e796c16bf7..ddd48367c37d3ca3472fc9a8730f71f2 this.targetSelector.addGoal(1, new Phantom.PhantomAttackPlayerTargetGoal()); } -@@ -323,6 +348,124 @@ public class Phantom extends FlyingMob implements Enemy { +@@ -325,6 +350,124 @@ public class Phantom extends FlyingMob implements Enemy { private AttackPhase() {} } diff --git a/patches/server/0086-Phantoms-burn-in-light.patch b/patches/server/0086-Phantoms-burn-in-light.patch index e9f43d8d7..ee89ad0b5 100644 --- a/patches/server/0086-Phantoms-burn-in-light.patch +++ b/patches/server/0086-Phantoms-burn-in-light.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index ddd48367c37d3ca3472fc9a8730f71f2e96743c2..007437edff2db6044adf9afca4a098509d007edf 100644 +index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff309eaa391f 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -51,6 +51,7 @@ public class Phantom extends FlyingMob implements Enemy { @@ -25,7 +25,7 @@ index ddd48367c37d3ca3472fc9a8730f71f2e96743c2..007437edff2db6044adf9afca4a09850 this.setSecondsOnFire(8); } -@@ -628,6 +629,12 @@ public class Phantom extends FlyingMob implements Enemy { +@@ -630,6 +631,12 @@ public class Phantom extends FlyingMob implements Enemy { return false; } else if (!entityliving.isAlive()) { return false; @@ -38,7 +38,7 @@ index ddd48367c37d3ca3472fc9a8730f71f2e96743c2..007437edff2db6044adf9afca4a09850 } else if (entityliving instanceof Player && (((Player) entityliving).isSpectator() || ((Player) entityliving).isCreative())) { return false; } else if (!this.canUse()) { -@@ -765,6 +772,7 @@ public class Phantom extends FlyingMob implements Enemy { +@@ -767,6 +774,7 @@ public class Phantom extends FlyingMob implements Enemy { this.nextScanTick = 60; List list = Phantom.this.level.getNearbyPlayers(this.attackTargeting, (LivingEntity) Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D)); diff --git a/patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch index 0b0d5a593..3e36bb4ad 100644 --- a/patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch @@ -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 3ecefe8dbde7ab2a83e62436808740380a1ecc48..cf3e37ffe33af3711ef18483fb55770cc494c3d2 100644 +index 09b2b06ffd52d988b8f4b768ebdc0cb28a8c853a..eb9c772c3da7205ba40f010aa417be8f7d2615d2 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; @@ -94,11 +94,11 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) { blockposition1 = blockposition2; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d339f0c9d37827887de5236cf3da801e3fe9127b..d23b3f22c05a10715e5c3305e7068dfc372e8d79 100644 +index 19292963c9897f6175eab8865d622439009cc956..e798d11ea085b6b13318f82b967a7b4708391a76 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -200,7 +200,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { - protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, final DimensionType dimensionmanager, Supplier supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper + protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, final DimensionType dimensionmanager, Supplier supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Anti-Xray - Pass executor this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper - this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName())); // Purpur diff --git a/patches/server/0204-API-for-any-mob-to-burn-daylight.patch b/patches/server/0204-API-for-any-mob-to-burn-daylight.patch index cfb977e51..0b32fa617 100644 --- a/patches/server/0204-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0204-API-for-any-mob-to-burn-daylight.patch @@ -112,7 +112,7 @@ index d92549e81160afaa1d109501806f3af96c475d7e..c5fa64b2d1559bf47b3dac8a2a10205e @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java -index af1a3c67c9e094fd5cc5d84600cc670aea055f69..64ea34d768fdcee86ab59c5a12f04ddc11b9d8f4 100644 +index 74f4f8e1c9faef3b50fa817ca3dfbb6b19b1622d..9c74969267d14b5c41187ef4182f56020af9685a 100644 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java @@ -65,6 +65,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo @@ -161,15 +161,16 @@ index af1a3c67c9e094fd5cc5d84600cc670aea055f69..64ea34d768fdcee86ab59c5a12f04ddc super.aiStep(); } -@@ -231,14 +211,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo - public void readAdditionalSaveData(CompoundTag nbt) { - super.readAdditionalSaveData(nbt); +@@ -233,7 +213,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo this.reassessWeaponGoal(); -- this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Paper -+ // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Paper // Purpur - implemented in LivingEntity + // Paper start + if (nbt.contains("Paper.ShouldBurnInDay")) { +- this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); ++ // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Purpur - implemented in LivingEntity + } + // Paper end } - - // Paper start +@@ -242,7 +222,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo @Override public void addAdditionalSaveData(CompoundTag nbt) { super.addAdditionalSaveData(nbt); @@ -200,7 +201,7 @@ index 6c89eabddda16f9b72e6062c31bb4be6beae442d..2ff43cebc2e6471395e90a8a19828d94 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index a8d8b524cd8e532f78ee6e61a883bd0aa340a718..99ac69b9d65ba5320043cc24eba1c102d552210f 100644 +index c39e2d05fa81279a684532ee796880b1345e8c1c..c44ca111cf8601256bbfb8b6fc95995677db9d1f 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -61,6 +61,7 @@ public class Phantom extends FlyingMob implements Enemy { @@ -220,16 +221,16 @@ index a8d8b524cd8e532f78ee6e61a883bd0aa340a718..99ac69b9d65ba5320043cc24eba1c102 this.setSecondsOnFire(8); } -@@ -263,7 +264,7 @@ public class Phantom extends FlyingMob implements Enemy { - if (nbt.hasUUID("Paper.SpawningEntity")) { +@@ -264,7 +265,7 @@ public class Phantom extends FlyingMob implements Enemy { this.spawningEntity = nbt.getUUID("Paper.SpawningEntity"); } -- this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); -+ // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Purpur - implemented in LivingEntity + if (nbt.contains("Paper.ShouldBurnInDay")) { +- this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); ++ // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Purpur - implemented in LivingEntity + } // Paper end } - -@@ -278,7 +279,7 @@ public class Phantom extends FlyingMob implements Enemy { +@@ -280,7 +281,7 @@ public class Phantom extends FlyingMob implements Enemy { if (this.spawningEntity != null) { nbt.putUUID("Paper.SpawningEntity", this.spawningEntity); } @@ -238,7 +239,7 @@ index a8d8b524cd8e532f78ee6e61a883bd0aa340a718..99ac69b9d65ba5320043cc24eba1c102 // Paper end } -@@ -339,7 +340,7 @@ public class Phantom extends FlyingMob implements Enemy { +@@ -341,7 +342,7 @@ public class Phantom extends FlyingMob implements Enemy { } public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; } diff --git a/patches/server/0211-Make-lightning-rod-range-configurable.patch b/patches/server/0211-Make-lightning-rod-range-configurable.patch index 614532baf..c2a99927a 100644 --- a/patches/server/0211-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0211-Make-lightning-rod-range-configurable.patch @@ -5,7 +5,7 @@ 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 48fd3ed38ae5961041276cd7b97bd36b4d3521d0..62cb26584e333b006f84f708a82dc247a7fcce7e 100644 +index 40ece868bdab53ee10a9b2251540849732e77f69..378a0feef4f178ddce1e852f07966f377802fa3a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -846,7 +846,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -18,10 +18,10 @@ index 48fd3ed38ae5961041276cd7b97bd36b4d3521d0..62cb26584e333b006f84f708a82dc247 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 fb4a745404c7b0c28f4eba8ebfdc87977a132884..728b31e4d59a824536dbb0de3edd88071b22b61a 100644 +index 8b5f2de46838e8c7c9e3ca6dfbd72bdbc6d82036..eaa0fcff033d59189475f7c04c5a3f2fc5421469 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -216,6 +216,7 @@ public class PurpurConfig { +@@ -325,6 +325,7 @@ public class PurpurConfig { public static boolean cryingObsidianValidForPortalFrame = false; public static int beeInsideBeeHive = 3; public static boolean anvilCumulativeCost = true; @@ -29,7 +29,7 @@ index fb4a745404c7b0c28f4eba8ebfdc87977a132884..728b31e4d59a824536dbb0de3edd8807 private static void blockSettings() { if (version < 3) { boolean oldValue = getBoolean("settings.barrel.packed-barrels", true); -@@ -233,6 +234,7 @@ public class PurpurConfig { +@@ -342,6 +343,7 @@ public class PurpurConfig { cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame); beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive); anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost); diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh new file mode 100644 index 000000000..e69de29bb