mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 12:36:07 +01:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
131 lines
3.5 KiB
Diff
131 lines
3.5 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..ef9e53a73eff469bbaa8fb20c634297acb9d1986
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java
|
|
@@ -0,0 +1,118 @@
|
|
+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.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when the player is attempting to rename a mob
|
|
+ */
|
|
+public class PlayerNameEntityEvent extends PlayerEvent implements Cancellable {
|
|
+
|
|
+ private LivingEntity entity;
|
|
+ private Component name;
|
|
+ private boolean persistent;
|
|
+ private boolean cancelled;
|
|
+
|
|
+ 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 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 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 persistent;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets whether this will set the mob to be persistent.
|
|
+ *
|
|
+ * @param persistent persistent
|
|
+ */
|
|
+ public void setPersistent(boolean persistent) {
|
|
+ this.persistent = persistent;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the cancellation state of this event. A cancelled event will not
|
|
+ * be executed in the server, but will still pass to other plugins
|
|
+ *
|
|
+ * @return true if this event is cancelled
|
|
+ */
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the cancellation state of this event. A cancelled event will not
|
|
+ * be executed in the server, but will still pass to other plugins.
|
|
+ *
|
|
+ * @param cancel true if you wish to cancel this event
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|