Paper/patches/api/0278-additions-to-PlayerGameModeChangeEvent.patch
Jake Potrebic ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) (#10691)
Updated Upstream (Bukkit/CraftBukkit)

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:
fa99e752 PR-1007: Add ItemMeta#getAsComponentString()
94a91782 Fix copy-pasted BlockType.Typed documentation
9b34ac8c Largely restore deprecated PotionData API
51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5
702d15fe Fix Javadoc reference
42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them
237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent
035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it
8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more
87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent

CraftBukkit Changes:
4af0f22e8 SPIGOT-7664: Item meta should prevail over block states
c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot
124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects
66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API
6118e5398 Fix regression listening to minecraft:brand custom payloads
c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check
12360a7ec Remove unused imports
147b098b4 PR-1397: Add ItemMeta#getAsComponentString()
428aefe0e Largely restore deprecated PotionData API
afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them
8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent
4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it
441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets
0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource
f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA
2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more
c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent
741b84480 PR-1390: Improve internal handling of damage sources
0364df4e1 SPIGOT-7657: Error when loading angry entities
2024-05-11 23:48:37 +02:00

122 lines
4.6 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 15 May 2021 10:04:50 -0700
Subject: [PATCH] additions to PlayerGameModeChangeEvent
diff --git a/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
index 4b96e0573c7ce32ad8c41124ee9ecab8359318a5..aee4a8b52c0d4abb655a4778575f0122acf19049 100644
--- a/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
@@ -8,15 +8,32 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when the GameMode of the player is changed.
+ * <p>
+ * <b>NOTE:</b> When {@link #getCause()} is {@link Cause#DEFAULT_GAMEMODE},
+ * the Player from {@link #getPlayer()} might not be fully online at
+ * the time this event is fired. Plugins should use {@link Player#isOnline()}
+ * to check before changing player state.
*/
public class PlayerGameModeChangeEvent extends PlayerEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private final GameMode newGameMode;
+ // Paper start
+ private final Cause cause;
+ private net.kyori.adventure.text.Component cancelMessage;
+ @Deprecated // Paper end
public PlayerGameModeChangeEvent(@NotNull final Player player, @NotNull final GameMode newGameMode) {
+ // Paper start
+ this(player, newGameMode, Cause.UNKNOWN, null);
+ }
+
+ public PlayerGameModeChangeEvent(@NotNull final Player player, @NotNull final GameMode newGameMode, @NotNull Cause cause, @org.jetbrains.annotations.Nullable net.kyori.adventure.text.Component cancelMessage) {
+ // Paper end
super(player);
this.newGameMode = newGameMode;
+ this.cause = cause; // Paper
+ this.cancelMessage = cancelMessage; // Paper
}
@Override
@@ -49,4 +66,77 @@ public class PlayerGameModeChangeEvent extends PlayerEvent implements Cancellabl
public static HandlerList getHandlerList() {
return handlers;
}
+ // Paper start
+ /**
+ * Gets the cause of this gamemode change.
+ *
+ * @return the cause
+ */
+ @NotNull
+ public Cause getCause() {
+ return cause;
+ }
+
+ /**
+ * <b>Only valid if the cause of the gamemode change was directly due to a command.</b>.
+ * Gets the message shown to the command user if the event is cancelled
+ * as a notification that a player's gamemode was not changed.
+ * <p>
+ * This returns {@code null} if the gamemode change was due to a plugin, or a
+ * player joining the game with a gamemode not equal to the server default gamemode
+ * and {@code force-gamemode} is set to true.
+ *
+ * @return the error message shown to the command user, null if not directly caused by a command
+ */
+ @org.jetbrains.annotations.Nullable
+ public net.kyori.adventure.text.Component cancelMessage() {
+ return cancelMessage;
+ }
+
+ /**
+ * Sets the message shown to the command user if the event was cancelled.
+ * <b>The message is only shown to cancelled events that are directly called by a command
+ * not by a plugin or a player joining with the wrong gamemode.</b>
+ *
+ * @param message the error message shown to the command user, null to show no message.
+ */
+ public void cancelMessage(@org.jetbrains.annotations.Nullable net.kyori.adventure.text.Component message) {
+ this.cancelMessage = message;
+ }
+
+ public enum Cause {
+
+ /**
+ * A plugin changed the player's gamemode with
+ * {@link Player#setGameMode(GameMode)}.
+ */
+ PLUGIN,
+
+ /**
+ * The {@code /gamemode} command was used.
+ */
+ COMMAND,
+
+ /**
+ * A player had their gamemode changed as a result of
+ * the {@code /defaultgamemode} command, or they joined
+ * with a gamemode that was not the default gamemode and
+ * {@code force-gamemode} in {@code server.properties} is set to true.
+ */
+ DEFAULT_GAMEMODE,
+
+ /**
+ * When the player dies in a hardcore world and has their gamemode
+ * changed to {@link GameMode#SPECTATOR}.
+ */
+ HARDCORE_DEATH,
+
+ /**
+ * This cause is only used if a plugin fired their own
+ * {@link PlayerGameModeChangeEvent} and did not include a
+ * cause. Can usually be ignored.
+ */
+ UNKNOWN,
+ }
+ // Paper end
}