From 51cdee9317bf93ece9ef41b2780c69c4f65f8ec1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 16 Jul 2021 21:14:41 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: 7f89e96 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6209) --- gradle.properties | 2 +- .../server/0001-Tuinity-Server-Changes.patch | 28 +++++++++---------- patches/server/0005-Ridables.patch | 8 +++--- ...15-Furnace-uses-lava-from-underneath.patch | 6 ++-- ...-check-to-EntityDamagedByEntityEvent.patch | 8 +++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gradle.properties b/gradle.properties index f28e6d460..d478ddc61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 packageVersion = 1_17_R1 -paperCommit = a5acf367a37549ea3b7cb0eb8c0115973d0c58de +paperCommit = 7f89e963579c9692325f3a4647ca9be0c4e2b60a org.gradle.parallel = true org.gradle.vfs.watch = false diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index a06b030bd..7043de85c 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -16391,7 +16391,7 @@ index 8245c5834ec69beb8e3b95fb3900601009a9273f..88f30cd8e57ccb69da633daac49f8bc9 @Override public BlockEntity getBlockEntity(BlockPos pos) { 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 cc02b577453fa251f0f1b508281ddea2513138a1..54e23d303aad286ab46c3e5f9b17a5f9922e2942 100644 +index a84b75a53a0324fab9aeb9b80bf74eb0a84ecd2e..4f6a356e3a27915f1d95132a0a5fddb163735cf6 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -1,5 +1,7 @@ @@ -16652,7 +16652,7 @@ index cc02b577453fa251f0f1b508281ddea2513138a1..54e23d303aad286ab46c3e5f9b17a5f9 Iterator iterator = protoChunk.getBlockEntities().values().iterator(); while (iterator.hasNext()) { -@@ -788,6 +920,7 @@ public class LevelChunk implements ChunkAccess { +@@ -794,6 +926,7 @@ public class LevelChunk implements ChunkAccess { // CraftBukkit start public void loadCallback() { @@ -16660,7 +16660,7 @@ index cc02b577453fa251f0f1b508281ddea2513138a1..54e23d303aad286ab46c3e5f9b17a5f9 // Paper start - neighbour cache int chunkX = this.chunkPos.x; int chunkZ = this.chunkPos.z; -@@ -807,6 +940,7 @@ public class LevelChunk implements ChunkAccess { +@@ -813,6 +946,7 @@ public class LevelChunk implements ChunkAccess { // Paper end - neighbour cache org.bukkit.Server server = this.level.getCraftServer(); this.level.getChunkSource().addLoadedChunk(this); // Paper @@ -16668,7 +16668,7 @@ index cc02b577453fa251f0f1b508281ddea2513138a1..54e23d303aad286ab46c3e5f9b17a5f9 if (server != null) { /* * If it's a new world, the first few chunks are generated inside -@@ -842,6 +976,7 @@ public class LevelChunk implements ChunkAccess { +@@ -848,6 +982,7 @@ public class LevelChunk implements ChunkAccess { } public void unloadCallback() { @@ -18639,10 +18639,10 @@ index dd435909ad16a7f732fd0a2056f986dd9b24c0d5..f243dbdf7673c06b0e2d36fe9af43234 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648efe082ee7 100644 +index 7dc26321e20e26821096e79356a358879306cd78..2e79e2a23a4aec4b526814f7e959232c0a074860 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -289,7 +289,7 @@ public class CraftWorld implements World { +@@ -290,7 +290,7 @@ public class CraftWorld implements World { public int getTileEntityCount() { return net.minecraft.server.MCUtil.ensureMain(() -> { // We don't use the full world tile entity list, so we must iterate chunks @@ -18651,7 +18651,7 @@ index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648e int size = 0; for (ChunkHolder playerchunk : chunks.values()) { net.minecraft.world.level.chunk.LevelChunk chunk = playerchunk.getTickingChunk(); -@@ -312,7 +312,7 @@ public class CraftWorld implements World { +@@ -313,7 +313,7 @@ public class CraftWorld implements World { return net.minecraft.server.MCUtil.ensureMain(() -> { int ret = 0; @@ -18660,7 +18660,7 @@ index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648e if (chunkHolder.getTickingChunk() != null) { ++ret; } -@@ -351,13 +351,20 @@ public class CraftWorld implements World { +@@ -352,13 +352,20 @@ public class CraftWorld implements World { this.generator = gen; this.environment = env; @@ -18686,7 +18686,7 @@ index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648e } @Override -@@ -431,14 +438,7 @@ public class CraftWorld implements World { +@@ -432,14 +439,7 @@ public class CraftWorld implements World { @Override public Chunk getChunkAt(int x, int z) { @@ -18702,7 +18702,7 @@ index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648e } // Paper start -@@ -486,13 +486,16 @@ public class CraftWorld implements World { +@@ -487,13 +487,16 @@ public class CraftWorld implements World { public Chunk[] getLoadedChunks() { // Paper start if (Thread.currentThread() != world.getLevel().thread) { @@ -18723,7 +18723,7 @@ index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648e return chunks.values().stream().map(ChunkHolder::getFullChunk).filter(Objects::nonNull).map(net.minecraft.world.level.chunk.LevelChunk::getBukkitChunk).toArray(Chunk[]::new); } -@@ -2671,7 +2674,7 @@ public class CraftWorld implements World { +@@ -2672,7 +2675,7 @@ public class CraftWorld implements World { // Paper end return this.world.getChunkSource().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> { net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk) either.left().orElse(null); @@ -18732,7 +18732,7 @@ index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648e return java.util.concurrent.CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk()); }, net.minecraft.server.MinecraftServer.getServer()); } -@@ -2696,14 +2699,14 @@ public class CraftWorld implements World { +@@ -2697,14 +2700,14 @@ public class CraftWorld implements World { throw new IllegalArgumentException("View distance " + viewDistance + " is out of range of [2, 32]"); } net.minecraft.server.level.ChunkMap chunkMap = getHandle().getChunkSource().chunkMap; @@ -18749,7 +18749,7 @@ index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648e } @Override -@@ -2712,11 +2715,22 @@ public class CraftWorld implements World { +@@ -2713,11 +2716,22 @@ public class CraftWorld implements World { throw new IllegalArgumentException("View distance " + viewDistance + " is out of range of [2, 32]"); } net.minecraft.server.level.ChunkMap chunkMap = getHandle().getChunkSource().chunkMap; @@ -18860,7 +18860,7 @@ index 3acb5f8a1f863b5ba47eac4190be8228324fc8e7..68cacecde84a592839b738723fb0b73f @Override public boolean teleport(Location location) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7b8885f48245c37ba7166abd44486027779e134e..5b2fcfac84f13ac2321676e484372597e8c665d0 100644 +index 9f8f3ad5fd2c9e43a5b99804e404f11e5056897f..538beaedac3f8fe85fe5125cce1043706a295f89 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -517,15 +517,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0005-Ridables.patch b/patches/server/0005-Ridables.patch index fffc5e1a0..58f428b27 100644 --- a/patches/server/0005-Ridables.patch +++ b/patches/server/0005-Ridables.patch @@ -5750,7 +5750,7 @@ index 68cacecde84a592839b738723fb0b73fcb958080..52760eabb45c8d2a3db4056ef219e7ea + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 9e08668ecf224dae91405da994cc7d346499a969..f9196241a0d6f9a70c674f7dfca5e013f9839398 100644 +index 21471cec1c8403b2b18744210ffe59a729d48105..fc392aaf818db1db15ed68620d6c670fe69534e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -537,6 +537,15 @@ public class CraftEventFactory { @@ -5769,7 +5769,7 @@ index 9e08668ecf224dae91405da994cc7d346499a969..f9196241a0d6f9a70c674f7dfca5e013 return event; } -@@ -944,6 +953,7 @@ public class CraftEventFactory { +@@ -959,6 +968,7 @@ public class CraftEventFactory { damageCause = DamageCause.ENTITY_EXPLOSION; } event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions); @@ -5777,7 +5777,7 @@ index 9e08668ecf224dae91405da994cc7d346499a969..f9196241a0d6f9a70c674f7dfca5e013 } event.setCancelled(cancelled); -@@ -1027,6 +1037,7 @@ public class CraftEventFactory { +@@ -1042,6 +1052,7 @@ public class CraftEventFactory { if (!event.isCancelled()) { event.getEntity().setLastDamageCause(event); } @@ -5785,7 +5785,7 @@ index 9e08668ecf224dae91405da994cc7d346499a969..f9196241a0d6f9a70c674f7dfca5e013 return event; } -@@ -1078,6 +1089,7 @@ public class CraftEventFactory { +@@ -1093,6 +1104,7 @@ public class CraftEventFactory { EntityDamageEvent event; if (damager != null) { event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions); diff --git a/patches/server/0115-Furnace-uses-lava-from-underneath.patch b/patches/server/0115-Furnace-uses-lava-from-underneath.patch index f4987a889..bb729d111 100644 --- a/patches/server/0115-Furnace-uses-lava-from-underneath.patch +++ b/patches/server/0115-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 348e485897c34cca19113cc35f055a58778ca38b..fb3f7e821224889b08c0f424d79e122cba9d0645 100644 +index 242d9b2ecb852d812d4887883cb2aabfd21e3715..2c64622577fdb6c2a5746471121403b633bf9042 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 348e485897c34cca19113cc35f055a58778ca38b..fb3f7e821224889b08c0f424d79e122c import net.minecraft.world.phys.Vec3; // CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlock; -@@ -317,6 +318,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit +@@ -319,6 +320,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit ItemStack itemstack = (ItemStack) blockEntity.items.get(1); @@ -39,7 +39,7 @@ index 348e485897c34cca19113cc35f055a58778ca38b..fb3f7e821224889b08c0f424d79e122c if (!blockEntity.isLit() && (itemstack.isEmpty() || ((ItemStack) blockEntity.items.get(0)).isEmpty())) { if (!blockEntity.isLit() && blockEntity.cookingProgress > 0) { blockEntity.cookingProgress = Mth.clamp(blockEntity.cookingProgress - 2, 0, blockEntity.cookingTotalTime); -@@ -380,6 +397,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit +@@ -394,6 +411,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit setChanged(world, pos, state); } diff --git a/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch index f71efd547..814eba92e 100644 --- a/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch +++ b/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch @@ -33,10 +33,10 @@ index 52d43c2bf1fa1bfa97aab02a9837c6b11ecafc9d..d57a1984328750f5a6db748ef2db21fb if (flag5) { if (i > 0) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f9196241a0d6f9a70c674f7dfca5e013f9839398..f60ef0605163ecf50d9f61a73a84146d214aaf19 100644 +index fc392aaf818db1db15ed68620d6c670fe69534e2..2187e7f35d055ed79a9873e4d5298aaa2faf2d58 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -952,7 +952,7 @@ public class CraftEventFactory { +@@ -967,7 +967,7 @@ public class CraftEventFactory { } else { damageCause = DamageCause.ENTITY_EXPLOSION; } @@ -45,7 +45,7 @@ index f9196241a0d6f9a70c674f7dfca5e013f9839398..f60ef0605163ecf50d9f61a73a84146d damager.processClick(InteractionHand.MAIN_HAND); // Purpur } event.setCancelled(cancelled); -@@ -1031,7 +1031,7 @@ public class CraftEventFactory { +@@ -1046,7 +1046,7 @@ public class CraftEventFactory { } else { throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.msgId)); } @@ -54,7 +54,7 @@ index f9196241a0d6f9a70c674f7dfca5e013f9839398..f60ef0605163ecf50d9f61a73a84146d event.setCancelled(cancelled); CraftEventFactory.callEvent(event); if (!event.isCancelled()) { -@@ -1088,7 +1088,7 @@ public class CraftEventFactory { +@@ -1103,7 +1103,7 @@ public class CraftEventFactory { private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map modifiers, Map> modifierFunctions, boolean cancelled) { EntityDamageEvent event; if (damager != null) {