Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
123 Zeilen
3.2 KiB
Diff
123 Zeilen
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 5 Jul 2020 00:34:24 -0700
|
|
Subject: [PATCH] added PlayerNameEntityEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java
|
|
new file mode 100755
|
|
index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b741cc39b61
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java
|
|
@@ -0,0 +1,110 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import net.kyori.adventure.text.Component;
|
|
+import org.bukkit.entity.LivingEntity;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when the player is attempting to rename a mob
|
|
+ */
|
|
+public class PlayerNameEntityEvent extends PlayerEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private LivingEntity entity;
|
|
+ private Component name;
|
|
+ private boolean persistent;
|
|
+
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public PlayerNameEntityEvent(@NotNull Player player, @NotNull LivingEntity entity, @NotNull Component name, boolean persistent) {
|
|
+ super(player);
|
|
+ this.entity = entity;
|
|
+ this.name = name;
|
|
+ this.persistent = persistent;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the name to be given to the entity.
|
|
+ *
|
|
+ * @return the name
|
|
+ */
|
|
+ @Nullable
|
|
+ public Component getName() {
|
|
+ return this.name;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the name to be given to the entity.
|
|
+ *
|
|
+ * @param name the name
|
|
+ */
|
|
+ public void setName(@Nullable Component name) {
|
|
+ this.name = name;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the entity involved in this event.
|
|
+ *
|
|
+ * @return the entity
|
|
+ */
|
|
+ @NotNull
|
|
+ public LivingEntity getEntity() {
|
|
+ return this.entity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the entity involved in this event.
|
|
+ *
|
|
+ * @param entity the entity
|
|
+ */
|
|
+ public void setEntity(@NotNull LivingEntity entity) {
|
|
+ this.entity = entity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets whether this will set the mob to be persistent.
|
|
+ *
|
|
+ * @return persistent
|
|
+ */
|
|
+ public boolean isPersistent() {
|
|
+ return this.persistent;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets whether this will set the mob to be persistent.
|
|
+ *
|
|
+ * @param persistent persistent
|
|
+ */
|
|
+ public void setPersistent(boolean persistent) {
|
|
+ this.persistent = persistent;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|