geforkt von Mirrors/Paper
b68b282439
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes:c4a67eedSPIGOT-4556: Fix plugins closing inventory during drop events5be2ddcbReplace version constants with methods to prevent compiler inlininga5b9c7b3Use API method to create offset command completions2bc7d1dfSPIGOT-3747: Add API for force loaded chunksa408f375SPIGOT-3538: Add getHitBlockFace for ProjectileHitEventb54b9409SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock79ded7a8SPIGOT-1811: Death message not shown on respawn screenb4a4f15dSPIGOT-943: InventoryCloseEvent called on death regardless of open inventory0afed592SPIGOT-794: Call EntityPlaceEvent for Minecart placement2b2d084aAdd InventoryView#getSlotType01a9959aDo not use deprecated ItemSpawnEvent constructor9642498dSPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event963f4a5fAdd PlayerItemDamageEvent63db0445Add API to get / set base arrow damage531c25d7Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS pluginsd05c8b14Mappings Updatebd36e200SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
49 Zeilen
1.7 KiB
Diff
49 Zeilen
1.7 KiB
Diff
From f6670ef133f3fce494c9f54045f6267657603349 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
|
|
--- 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;
|
|
private boolean cancel = false;
|
|
+ // Paper start - add source block
|
|
+ private int sourceX;
|
|
+ private int sourceY;
|
|
+ private int sourceZ;
|
|
+ private Block sourceBlock;
|
|
+
|
|
+ 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;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
public BlockPhysicsEvent(final Block block, final BlockData changed) {
|
|
super(block);
|
|
this.changed = changed;
|
|
+ this.sourceBlock = block; // Paper - add source block
|
|
}
|
|
|
|
/**
|
|
--
|
|
2.20.1
|
|
|