mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
c0c212bf48
Upstream has released updates that appears to apply and compile correctly Paper Changes: b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads 3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495 e470f1ef Add more information to Timing Reports f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers a4fe910f Fix sounds when using worldedit regen command 70ad51a8 Updated Upstream (Bukkit/CraftBukkit) d7cfa4fa Improve legacy format serialization more
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 2d430ee7eddeccfec313ff6b233cd21610d43268 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] Add getPlayer to SkeletonHorseTrapEvent
|
|
|
|
---
|
|
.../event/entity/SkeletonHorseTrapEvent.java | 24 +++++++++++++++++++
|
|
1 file changed, 24 insertions(+)
|
|
|
|
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 d79dbcd68..1ed3ea8fa 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;
|
|
--
|
|
2.24.0
|
|
|