Skip to content

Commit 51f0537

Browse files
authored
Fix duplicate calls of certain click events (#6309)
1 parent 69eb15f commit 51f0537

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/main/java/ch/njol/skript/events/EvtClick.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ public class EvtClick extends SkriptEvent {
5757
*/
5858
public static final ClickEventTracker interactTracker = new ClickEventTracker(Skript.getInstance());
5959

60-
/**
61-
* Tracks PlayerInteractEntityEvents to deduplicate them.
62-
*/
63-
private static final ClickEventTracker entityInteractTracker = new ClickEventTracker(Skript.getInstance());
64-
6560
static {
6661
Class<? extends PlayerEvent>[] eventTypes = CollectionUtils.array(
6762
PlayerInteractEvent.class, PlayerInteractEntityEvent.class, PlayerInteractAtEntityEvent.class
@@ -147,7 +142,7 @@ public boolean check(Event event) {
147142

148143
// PlayerInteractAtEntityEvent called only once for armor stands
149144
if (!(event instanceof PlayerInteractAtEntityEvent)) {
150-
if (!entityInteractTracker.checkEvent(clickEvent.getPlayer(), clickEvent, clickEvent.getHand())) {
145+
if (!interactTracker.checkEvent(clickEvent.getPlayer(), clickEvent, clickEvent.getHand())) {
151146
return false; // Not first event this tick
152147
}
153148
}

0 commit comments

Comments
 (0)