2018-08-24 16:38:31 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Sotr <i@omc.hk>
|
|
|
|
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
|
2018-08-26 20:11:49 +02:00
|
|
|
index 5e47eabe8..9d9e4712b 100644
|
2018-08-24 16:38:31 +02:00
|
|
|
--- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
|
|
|
|
+++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
|
|
|
|
@@ -0,0 +0,0 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
|
|
|
|
private static final HandlerList handlers = new HandlerList();
|
2018-08-24 17:57:11 +02:00
|
|
|
private final BlockData changed;
|
2018-08-24 16:38:31 +02:00
|
|
|
private boolean cancel = false;
|
|
|
|
+ // Paper start - add source block
|
|
|
|
+ private int sourceX;
|
|
|
|
+ private int sourceY;
|
|
|
|
+ private int sourceZ;
|
|
|
|
+ private Block sourceBlock;
|
|
|
|
+
|
2018-08-24 17:57:11 +02:00
|
|
|
+ public BlockPhysicsEvent(final Block block, final BlockData changed, final int sourceX, final int sourceY, final int sourceZ) {
|
2018-08-24 16:38:31 +02:00
|
|
|
+ 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
|
|
|
|
|
2018-08-24 17:57:11 +02:00
|
|
|
public BlockPhysicsEvent(final Block block, final BlockData changed) {
|
2018-08-24 16:38:31 +02:00
|
|
|
super(block);
|
|
|
|
this.changed = changed;
|
|
|
|
+ this.sourceBlock = block; // Paper - add source block
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
--
|