mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
19 lines
1.1 KiB
Diff
19 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Trigary <trigary0@gmail.com>
|
|
Date: Tue, 2 Feb 2021 09:17:59 +0100
|
|
Subject: [PATCH] stop firing pressure plate EntityInteractEvent for ignored
|
|
entities
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/PressurePlateBlock.java b/src/main/java/net/minecraft/world/level/block/PressurePlateBlock.java
|
|
index f12bf33aa8cc8043052aa1048087f61d9a6d4d52..ae5b052b80665bfba126f5ca5dcd78608cb27d48 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/PressurePlateBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/PressurePlateBlock.java
|
|
@@ -81,6 +81,7 @@ public class PressurePlateBlock extends BasePressurePlateBlock {
|
|
|
|
while (iterator.hasNext()) {
|
|
Entity entity = (Entity) iterator.next();
|
|
+ if (entity.isIgnoringBlockTriggers()) continue; // Paper - don't call event for ignored entities
|
|
|
|
// CraftBukkit start - Call interact event when turning on a pressure plate
|
|
if (this.getSignalForState(world.getBlockState(pos)) == 0) {
|