mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
ef0e5a642d
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: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
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) {
|