mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
5c7cdad371
Upstream has released updates that appears to apply and compile correctly Paper Changes: fcbeac8a [CI-SKIP] Readme update (#3702) 824f8086 Bandaid italic legacy serialization #3757 (#3760) Tuinity Changes: 9f21359: Re-add optimise collision checking in player move packet handling 1152054: Revert player move packet optimisation ef0a6c4: Optimise collision checking in player move packets
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 19 Oct 2019 02:35:24 -0500
|
|
Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
|
|
index d79dbcd6..1ed3ea8f 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
|
|
@@ -1,20 +1,30 @@
|
|
package com.destroystokyo.paper.event.entity;
|
|
|
|
+import org.bukkit.entity.Player;
|
|
import org.bukkit.entity.SkeletonHorse;
|
|
import org.bukkit.event.Cancellable;
|
|
import org.bukkit.event.HandlerList;
|
|
import org.bukkit.event.entity.EntityEvent;
|
|
import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
|
|
/**
|
|
* Event called when a player gets close to a skeleton horse and triggers the lightning trap
|
|
*/
|
|
public class SkeletonHorseTrapEvent extends EntityEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
+ private final Player player; // Purpur
|
|
private boolean cancelled;
|
|
|
|
public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse) {
|
|
+ // Purpur start
|
|
+ this(horse, null);
|
|
+ }
|
|
+
|
|
+ public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse, @Nullable Player player) {
|
|
+ // Purpur end
|
|
super(horse);
|
|
+ this.player = player; // Purpur
|
|
}
|
|
|
|
@NotNull
|
|
@@ -23,6 +33,20 @@ public class SkeletonHorseTrapEvent extends EntityEvent implements Cancellable {
|
|
return (SkeletonHorse) super.getEntity();
|
|
}
|
|
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Get the player that triggered this trap event
|
|
+ * <p>
|
|
+ * Null value if called by a plugin that does not support this feature
|
|
+ *
|
|
+ * @return Player that triggered event
|
|
+ */
|
|
+ @Nullable
|
|
+ public Player getPlayer() {
|
|
+ return player;
|
|
+ }
|
|
+ // Purpur end
|
|
+
|
|
@Override
|
|
public boolean isCancelled() {
|
|
return cancelled;
|