From 6c32ee4a5ccc139401593fd76cd587f71690cd67 Mon Sep 17 00:00:00 2001 From: Christopher White Date: Wed, 22 Aug 2018 18:13:03 -0700 Subject: [PATCH 1/3] Add isChunkGenerated API (#1363) Resolves #1329 --- .../0130-isChunkGenerated-API.patch | 69 +++++++++++++++++++ .../0356-isChunkGenerated-API.patch | 44 ++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 Spigot-API-Patches/0130-isChunkGenerated-API.patch create mode 100644 Spigot-Server-Patches/0356-isChunkGenerated-API.patch diff --git a/Spigot-API-Patches/0130-isChunkGenerated-API.patch b/Spigot-API-Patches/0130-isChunkGenerated-API.patch new file mode 100644 index 0000000000..4268e40d96 --- /dev/null +++ b/Spigot-API-Patches/0130-isChunkGenerated-API.patch @@ -0,0 +1,69 @@ +From b036cb38ebab110e948775363f38ffb16c149199 Mon Sep 17 00:00:00 2001 +From: cswhite2000 <18whitechristop@gmail.com> +Date: Tue, 21 Aug 2018 19:39:46 -0700 +Subject: [PATCH] isChunkGenerated API + +Resolves #1329 + +diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java +index 7e1ee875..9457832b 100644 +--- a/src/main/java/org/bukkit/Location.java ++++ b/src/main/java/org/bukkit/Location.java +@@ -9,6 +9,7 @@ import org.bukkit.util.NumberConversions; + import org.bukkit.util.Vector; + + // Paper start ++import com.google.common.base.Preconditions; + import java.util.Collection; + import java.util.function.Predicate; + import org.bukkit.entity.Entity; +@@ -502,6 +503,15 @@ public class Location implements Cloneable, ConfigurationSerializable { + public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper + + // Paper start ++ /** ++ * Checks if a {@link Chunk} has been generated at this location. ++ * ++ * @return true if a chunk has been generated at this location ++ */ ++ public boolean isGenerated() { ++ Preconditions.checkNotNull(world, "Location has no world!"); ++ return world.isChunkGenerated(locToBlock(x) >> 4, locToBlock(z) >> 4); ++ } + + /** + * Sets the position of this Location and returns itself +diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java +index a6facc4b..d5058634 100644 +--- a/src/main/java/org/bukkit/World.java ++++ b/src/main/java/org/bukkit/World.java +@@ -210,6 +210,26 @@ public interface World extends PluginMessageRecipient, Metadatable { + public default Chunk getChunkAt(long chunkKey) { + return getChunkAt((int) chunkKey, (int) (chunkKey >> 32)); + } ++ ++ /** ++ * Checks if a {@link Chunk} has been generated at the specified chunk key, ++ * which is the X and Z packed into a long. ++ * ++ * @param chunkKey The Chunk Key to look up the chunk by ++ * @return true if the chunk has been generated, otherwise false ++ */ ++ public default boolean isChunkGenerated(long chunkKey) { ++ return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32)); ++ } ++ ++ /** ++ * Checks if a {@link Chunk} has been generated at the given coordinates. ++ * ++ * @param x X-coordinate of the chunk ++ * @param z Z-coordinate of the chunk ++ * @return true if the chunk has been generated, otherwise false ++ */ ++ public boolean isChunkGenerated(int x, int z); + // Paper end + + /** +-- +2.18.0 + diff --git a/Spigot-Server-Patches/0356-isChunkGenerated-API.patch b/Spigot-Server-Patches/0356-isChunkGenerated-API.patch new file mode 100644 index 0000000000..2fd75c25a3 --- /dev/null +++ b/Spigot-Server-Patches/0356-isChunkGenerated-API.patch @@ -0,0 +1,44 @@ +From 2f16be2d68ab57aac9b4568aa113b15f6b0d6af2 Mon Sep 17 00:00:00 2001 +From: cswhite2000 <18whitechristop@gmail.com> +Date: Tue, 21 Aug 2018 19:44:10 -0700 +Subject: [PATCH] isChunkGenerated API + +Resolves #1329 + +diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java +index 0eba3df5..ad548590 100644 +--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java ++++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +@@ -85,6 +85,12 @@ public class ChunkProviderServer implements IChunkProvider { + + } + ++ // Paper start ++ public boolean isChunkGenerated(int x, int z) { ++ return this.chunks.containsKey(ChunkCoordIntPair.asLong(x, z)) || this.chunkLoader.chunkExists(x, z); ++ } ++ // Paper end ++ + @Nullable + public Chunk getLoadedChunkAt(int i, int j) { + long k = ChunkCoordIntPair.a(i, j); +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +index 567e9acb..afb141c6 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +@@ -630,6 +630,12 @@ public class CraftWorld implements World { + return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4); + } + ++ // Paper start ++ public boolean isChunkGenerated(int x, int z) { ++ return this.getHandle().getChunkProviderServer().isChunkGenerated(x, z); ++ } ++ // Paper end ++ + public ChunkGenerator getGenerator() { + return generator; + } +-- +2.18.0 + From 0ade5595ada580e9a399c07e56128d08816c488d Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Aug 2018 21:50:36 -0400 Subject: [PATCH 2/3] [CI-SKIP] Ensure symlink process never fails build not sure if this is source of #1365, but doesn't hurt to make this a non fatal error if the symlink command fails. --- scripts/decompile.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/decompile.sh b/scripts/decompile.sh index 2018259c37..032abdb704 100755 --- a/scripts/decompile.sh +++ b/scripts/decompile.sh @@ -34,9 +34,10 @@ fi # set a symlink to current currentlink="$workdir/Minecraft/current" if ([ ! -e "$currentlink" ] || [ -L "$currentlink" ]) && [ "$windows" == "false" ]; then + set +e echo "Pointing $currentlink to $minecraftversion" - rm -rf "$currentlink" - ln -sfn "$minecraftversion" "$currentlink" + rm -rf "$currentlink" || true + ln -sfn "$minecraftversion" "$currentlink" || echo "Failed to set current symlink" fi ) From a1e9cd39d258e0d071d0e1d0f4e86d9409a2793d Mon Sep 17 00:00:00 2001 From: cakoyo Date: Fri, 24 Aug 2018 22:38:31 +0800 Subject: [PATCH 3/3] Add source block to BlockPhysicsEvent (#1364) Resolves #1275 For plants, the source block is itself, because the `changed` type is itself. --- ...dd-source-block-to-BlockPhysicsEvent.patch | 61 +++++++++++++++++++ ...dd-source-block-to-BlockPhysicsEvent.patch | 22 +++++++ 2 files changed, 83 insertions(+) create mode 100644 Spigot-API-Patches/0131-Add-source-block-to-BlockPhysicsEvent.patch create mode 100644 Spigot-Server-Patches/0357-Add-source-block-to-BlockPhysicsEvent.patch diff --git a/Spigot-API-Patches/0131-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0131-Add-source-block-to-BlockPhysicsEvent.patch new file mode 100644 index 0000000000..f5574f5695 --- /dev/null +++ b/Spigot-API-Patches/0131-Add-source-block-to-BlockPhysicsEvent.patch @@ -0,0 +1,61 @@ +From a802db6737065697d3668b53a32d9eb5265fdab5 Mon Sep 17 00:00:00 2001 +From: Sotr +Date: Thu, 23 Aug 2018 16:14:25 +0800 +Subject: [PATCH] Add source block to BlockPhysicsEvent + + +diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +index 01a545b4..d17e05ac 100644 +--- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java ++++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +@@ -12,6 +12,39 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { + private static final HandlerList handlers = new HandlerList(); + private final int changed; + private boolean cancel = false; ++ // Paper start - add source block ++ private int sourceX; ++ private int sourceY; ++ private int sourceZ; ++ private Block sourceBlock; ++ ++ /** ++ * ++ * @deprecated Magic value ++ * @param block the block involved in this event ++ * @param changed the changed block's type id ++ * @param sourceX the x of the source block ++ * @param sourceY the y of the source block ++ * @param sourceZ the z of the source block ++ */ ++ @Deprecated ++ public BlockPhysicsEvent(final Block block, final int changed, final int sourceX, final int sourceY, final int sourceZ) { ++ this(block, changed); ++ this.sourceX = sourceX; ++ this.sourceY = sourceY; ++ this.sourceZ = sourceZ; ++ this.sourceBlock = null; ++ } ++ ++ /** ++ * Gets the source block, causing this event ++ * ++ * @return Source block ++ */ ++ public Block getSourceBlock() { ++ return sourceBlock == null ? (sourceBlock = block.getWorld().getBlockAt(sourceX, sourceY, sourceZ)) : sourceBlock; ++ } ++ // Paper end + + /** + * +@@ -23,6 +56,7 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { + public BlockPhysicsEvent(final Block block, final int changed) { + super(block); + this.changed = changed; ++ this.sourceBlock = block; // Paper - add source block + } + + /** +-- +2.18.0.windows.1 + diff --git a/Spigot-Server-Patches/0357-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-Server-Patches/0357-Add-source-block-to-BlockPhysicsEvent.patch new file mode 100644 index 0000000000..b368555f36 --- /dev/null +++ b/Spigot-Server-Patches/0357-Add-source-block-to-BlockPhysicsEvent.patch @@ -0,0 +1,22 @@ +From d81b977104ba95086af880aff9f93669ea99537f Mon Sep 17 00:00:00 2001 +From: Sotr +Date: Thu, 23 Aug 2018 16:14:12 +0800 +Subject: [PATCH] Add source block to BlockPhysicsEvent + + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index 04d0fa1d..64d75934 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -590,7 +590,7 @@ public abstract class World implements IBlockAccess { + // CraftBukkit start + CraftWorld world = ((WorldServer) this).getWorld(); + if (world != null && !((WorldServer)this).stopPhysicsEvent) { // Paper +- BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftMagicNumbers.getId(block)); ++ BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftMagicNumbers.getId(block), blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()); // Paper - add source block + this.getServer().getPluginManager().callEvent(event); + + if (event.isCancelled()) { +-- +2.18.0.windows.1 +