Use internals for getting block/entity countstimings/use-internals

For a long time I've been meaning to move some of this logic internally
as this would allow us to avoid hitting systems like block state snapshots
which can create issues as many of the spigot implementations of this
stuff are increasingly broken, leading to unexpected crashes during ticking,
even if the API cannot properly interact with these such states/items,
it's generally more preferable to not crash the server in the course,
and just let those interactions fail more gracefully.

1 files changed, 55 insertions, 0 deletions

diff --git a/patches/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch
new file mode 100644
index 0000000000..f12e6ac1f5
--- /dev/null
+++ b/patches/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sotr <[email protected]>
+Date: Thu, 23 Aug 2018 16:14:25 +0800
+Subject: [PATCH] Add source block constructor and getChangedBlockData() 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 e3a5f5824ed882058f5bac5003f66ce79733a868..b23686d2e452dc0b8bde453b4a375f424cb7504a 100644
+--- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
++++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
+@@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
+     private final Block sourceBlock;
+     private boolean cancel = false;
+ 
++    // Paper start - Legacy constructor, use #BlockPhysicsEvent(Block, BlockData, Block)
++    @Deprecated
++    public BlockPhysicsEvent(final Block block, final BlockData changed, final int sourceX, final int sourceY, final int sourceZ) {
++        this(block, changed, block.getWorld().getBlockAt(sourceX, sourceY, sourceZ));
++    }
++    // Paper end
++
+     public BlockPhysicsEvent(@NotNull final Block block, @NotNull final BlockData changed) {
+         this(block, changed, block);
+     }
+@@ -55,7 +62,8 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
+     }
+ 
+     /**
+-     * Gets the type of block that changed, causing this event
++     * Gets the type of block that changed, causing this event.
++     * This is the type of {@link #getBlock()} at the time of the event.
+      *
+      * @return Changed block's type
+      */
+@@ -64,6 +72,19 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
+         return changed.getMaterial();
+     }
+ 
++    // Paper start - Getter for the BlockData
++    /**
++     * Gets the BlockData of the block that changed, causing this event.
++     * This is the BlockData of {@link #getBlock()} at the time of the event.
++     *
++     * @return Changed block's BlockData
++     */
++    @NotNull
++    public BlockData getChangedBlockData() {
++        return changed.clone();
++    }
++    // Paper end
++
+     @Override
+     public boolean isCancelled() {
+         return cancel;