From d413f6f6313249dcd85e8895de2fa7a9b94e772e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 15 Feb 2022 10:47:49 -0600 Subject: [PATCH] Updated Upstream (Paper & Pufferfish) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c50fc3a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7480) Pufferfish Changes: pufferfish-gg/Pufferfish@81f546b Fix SIMD when pixel counts aren't divisible by 8 --- gradle.properties | 2 +- patches/api/0001-Pufferfish-API-Changes.patch | 4 ++-- ...097-Allow-toggling-special-MobSpawners-per-world.patch | 6 +++--- .../server/0107-Furnace-uses-lava-from-underneath.patch | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7af5957ee..6458f75ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT mcVersion = 1.18.1 packageVersion = 1_18_R1 -paperCommit = 09384aef71bebdd904139eeda9437489bb879f73 +paperCommit = b19e67928792d92035b17b1a62dba95fbe8c6c9e org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 13f32d922..f91cdc368 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -287,7 +287,7 @@ index 0000000000000000000000000000000000000000..1bbec0b032a4765f5e55a1475a1b7401 +} diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java new file mode 100644 -index 0000000000000000000000000000000000000000..48b67864752d6da4e2cc626e746eeb7c32b6524f +index 0000000000000000000000000000000000000000..2341b564b6383d5eca5fafe80273e046bfea070e --- /dev/null +++ b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java @@ -0,0 +1,79 @@ @@ -306,7 +306,7 @@ index 0000000000000000000000000000000000000000..48b67864752d6da4e2cc626e746eeb7c + public static void matchColorVectorized(int[] in, byte[] out) { + int speciesLength = IntVector.SPECIES_256.length(); + int i; -+ for (i = 0; i < in.length; i += speciesLength) { ++ for (i = 0; i < in.length - speciesLength; i += speciesLength) { + float[] redsArr = new float[speciesLength]; + float[] bluesArr = new float[speciesLength]; + float[] greensArr = new float[speciesLength]; diff --git a/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch index 9ec908709..98686038d 100644 --- a/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0097-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 2f8efdd72ee3ef12ce8223b73281f4170ad1bbf1..3fc111ee19000a9e665f00e168d1278cd5de0d25 100644 +index 4fcc013883a7dbf58e4cf3972d43516cd51f8e7e..9ff1f59202fa359c01aa7f976866a8dfe5a41133 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; @@ -61,7 +61,7 @@ index 2f8efdd72ee3ef12ce8223b73281f4170ad1bbf1..3fc111ee19000a9e665f00e168d1278c + // Purpur end // CraftBukkit start this.serverLevelData = (PrimaryLevelData) iworlddataserver; - serverLevelData.world = this; + this.serverLevelData.setWorld(this); diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java index 323eea2bccacfcc85849b5d82c2b30d991e0c0d8..bb5918ff947eb4cc4d0c964b2a8a9166c5745987 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java @@ -94,7 +94,7 @@ index 323eea2bccacfcc85849b5d82c2b30d991e0c0d8..bb5918ff947eb4cc4d0c964b2a8a9166 if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) { blockposition1 = blockposition2; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8ff90ee18ed8a6d6c5be991a5a0841383dd93f6c..8063f1d20a6f505514c94a28b890488319ca5628 100644 +index 2a226f91d7afe0489adb4dbe94d69e6fc8e6e4e4..923110da6494664fef30fd20a7d9282eaac825f9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -68,6 +68,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0107-Furnace-uses-lava-from-underneath.patch b/patches/server/0107-Furnace-uses-lava-from-underneath.patch index e3f4be6e1..3fbaded9e 100644 --- a/patches/server/0107-Furnace-uses-lava-from-underneath.patch +++ b/patches/server/0107-Furnace-uses-lava-from-underneath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Furnace uses lava from underneath diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -index fb15ece736dde16066818216749fb2efba0b3b21..0d9b592ebfd22dc679ba7dbfd339db4d6bc5ad44 100644 +index 11b2fcb783422216b45c8fcf5df37842b2b4e7b2..0a78f9171bd3413e644046d6467063191ac04d81 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java @@ -40,6 +40,7 @@ import net.minecraft.world.level.Level; @@ -16,7 +16,7 @@ index fb15ece736dde16066818216749fb2efba0b3b21..0d9b592ebfd22dc679ba7dbfd339db4d import net.minecraft.world.phys.Vec3; // CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlock; -@@ -318,6 +319,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit +@@ -322,6 +323,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit ItemStack itemstack = (ItemStack) blockEntity.items.get(1); @@ -39,7 +39,7 @@ index fb15ece736dde16066818216749fb2efba0b3b21..0d9b592ebfd22dc679ba7dbfd339db4d if (!blockEntity.isLit() && (itemstack.isEmpty() || ((ItemStack) blockEntity.items.get(0)).isEmpty())) { if (!blockEntity.isLit() && blockEntity.cookingProgress > 0) { blockEntity.cookingProgress = Mth.clamp(blockEntity.cookingProgress - 2, (int) 0, blockEntity.cookingTotalTime); -@@ -393,6 +410,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit +@@ -397,6 +414,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit setChanged(world, pos, state); } @@ -48,7 +48,7 @@ index fb15ece736dde16066818216749fb2efba0b3b21..0d9b592ebfd22dc679ba7dbfd339db4d private static boolean canBurn(@Nullable Recipe recipe, NonNullList slots, int count) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index dd8914c2501b0bbbe92004fc3120c73257fab478..ff5a726ab8735975e6c285a2dce9df6576908ac9 100644 +index f6961d623c5718638c75e2a8775ffcbed65e9bdc..5e19075f9244ba96f2420273139c520b1c11f613 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -401,6 +401,17 @@ public class PurpurWorldConfig {