twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-05 14:42:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream B/CB/S

Browse Source 
Also fixes build as a result of an upstream force push

--- work/Bukkit
Submodule work/Bukkit 217dc08d..d13fdf8c:
  > SPIGOT-4637: Add source block to BlockPhysicsEvent.

--- work/CraftBukkit
Submodule work/CraftBukkit acbba8ba..cb98c6ea:
  > Fix line endings in CraftDefaultPermissions
  > SPIGOT-4637: Add source block to BlockPhysicsEvent.

--- work/Spigot
Submodule work/Spigot 75ee78a0c...4165cd8f4 (commits not present)
  > (Manually Added) - Appears to be a result of an upstream force push
  > (Manually Added) - Changed: SPIGOT-4636: Add creative mode NBT permissions
This commit is contained in:
Zach Brown
2019-02-25 04:39:24 -05:00
parent a76df3ca91
commit 80620a2861
72 changed files with 198 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Spigot-API-Patches/Add-source-block-to-BlockPhysicsEvent.patch
View File

@@ -5,42 +5,21 @@ 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 5e47eabe..9d9e4712 100644
index a34359ed..cda896fa 100644
--- 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();
private final BlockData changed;
private final Block sourceBlock;
private boolean cancel = false;
+ // Paper start - add source block
+ private int sourceX;
+ private int sourceY;
+ private int sourceZ;
+ private Block sourceBlock;
+
+ // 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);
+ 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;
+ this(block, changed, block.getWorld().getBlockAt(sourceX, sourceY, sourceZ));
+ }
+ // Paper end
+
public BlockPhysicsEvent(final Block block, final BlockData changed) {
super(block);
this.changed = changed;
+ this.sourceBlock = block; // Paper - add source block
this(block, changed, block);
}
/**
--