mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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 158bfbecf3
commit 1e38743b1d
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
86 changed files with 282 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Spigot-API-Patches/0144-Add-source-block-to-BlockPhysicsEvent.patch
View file

@ -1,48 +1,27 @@
From e8b6405b84b65b5726de26bbcff1c2ef0b0519ee Mon Sep 17 00:00:00 2001
From 92f743e9e76007184f2786aa099069484093b076 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
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
@@ -29,10 +29,34 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private final BlockData changed;
@@ -31,6 +31,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
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);
}
/**
--
2.20.1