2021-08-06 22:37:38 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Wed, 19 May 2021 18:59:10 -0700
|
|
|
|
Subject: [PATCH] Add PlayerSetSpawnEvent
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java b/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
|
2024-01-19 13:22:30 +01:00
|
|
|
index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b345b526b6 100644
|
2021-08-06 22:37:38 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
|
2023-06-08 21:00:58 +02:00
|
|
|
@@ -38,24 +38,34 @@ public class SetSpawnCommand {
|
2023-05-12 13:10:08 +02:00
|
|
|
ResourceKey<Level> resourcekey = source.getLevel().dimension();
|
|
|
|
Iterator iterator = targets.iterator();
|
2021-08-06 22:37:38 +02:00
|
|
|
|
2024-01-19 13:22:30 +01:00
|
|
|
+ final Collection<ServerPlayer> actualTargets = new java.util.ArrayList<>(); // Paper - Add PlayerSetSpawnEvent
|
2023-05-12 13:10:08 +02:00
|
|
|
while (iterator.hasNext()) {
|
|
|
|
ServerPlayer entityplayer = (ServerPlayer) iterator.next();
|
|
|
|
|
|
|
|
- entityplayer.setRespawnPosition(resourcekey, pos, angle, true, false, org.bukkit.event.player.PlayerSpawnChangeEvent.Cause.COMMAND); // CraftBukkit
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper start - Add PlayerSetSpawnEvent
|
2023-05-12 13:10:08 +02:00
|
|
|
+ if (entityplayer.setRespawnPosition(resourcekey, pos, angle, true, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.COMMAND)) {
|
|
|
|
+ actualTargets.add(entityplayer);
|
2022-04-30 22:24:47 +02:00
|
|
|
+ }
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper end - Add PlayerSetSpawnEvent
|
2021-08-06 22:37:38 +02:00
|
|
|
}
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper start - Add PlayerSetSpawnEvent
|
2022-04-30 22:24:47 +02:00
|
|
|
+ if (actualTargets.isEmpty()) {
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper end - Add PlayerSetSpawnEvent
|
2021-08-06 22:37:38 +02:00
|
|
|
|
2023-05-12 13:10:08 +02:00
|
|
|
String s = resourcekey.location().toString();
|
|
|
|
|
2023-06-08 21:00:58 +02:00
|
|
|
- if (targets.size() == 1) {
|
2024-01-19 13:22:30 +01:00
|
|
|
+ if (actualTargets.size() == 1) { // Paper - Add PlayerSetSpawnEvent
|
2023-06-08 21:00:58 +02:00
|
|
|
source.sendSuccess(() -> {
|
|
|
|
- return Component.translatable("commands.spawnpoint.success.single", pos.getX(), pos.getY(), pos.getZ(), angle, s, ((ServerPlayer) targets.iterator().next()).getDisplayName());
|
2024-01-19 13:22:30 +01:00
|
|
|
+ return Component.translatable("commands.spawnpoint.success.single", pos.getX(), pos.getY(), pos.getZ(), angle, s, ((ServerPlayer) actualTargets.iterator().next()).getDisplayName()); // Paper - Add PlayerSetSpawnEvent
|
2023-06-08 21:00:58 +02:00
|
|
|
}, true);
|
|
|
|
} else {
|
|
|
|
source.sendSuccess(() -> {
|
|
|
|
- return Component.translatable("commands.spawnpoint.success.multiple", pos.getX(), pos.getY(), pos.getZ(), angle, s, targets.size());
|
2024-01-19 13:22:30 +01:00
|
|
|
+ return Component.translatable("commands.spawnpoint.success.multiple", pos.getX(), pos.getY(), pos.getZ(), angle, s, actualTargets.size()); // Paper - Add PlayerSetSpawnEvent
|
2023-06-08 21:00:58 +02:00
|
|
|
}, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
- return targets.size();
|
2024-01-19 13:22:30 +01:00
|
|
|
+ return actualTargets.size(); // Paper - Add PlayerSetSpawnEvent
|
2023-06-08 21:00:58 +02:00
|
|
|
}
|
|
|
|
}
|
2021-08-06 22:37:38 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2024-01-19 17:54:05 +01:00
|
|
|
index 68c9e9e6185abdff5b7239002f4005417079c083..36e01f491565e70601464d957143c21aba17dfa1 100644
|
2021-08-06 22:37:38 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2023-12-29 20:57:32 +01:00
|
|
|
@@ -1356,7 +1356,7 @@ public class ServerPlayer extends Player {
|
2021-08-06 22:37:38 +02:00
|
|
|
} else if (this.bedBlocked(blockposition, enumdirection)) {
|
|
|
|
return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
|
|
|
|
} else {
|
2023-06-08 04:04:01 +02:00
|
|
|
- this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true, PlayerSpawnChangeEvent.Cause.BED); // CraftBukkit
|
2024-01-19 13:22:30 +01:00
|
|
|
+ this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.BED); // Paper - Add PlayerSetSpawnEvent
|
2023-06-08 04:04:01 +02:00
|
|
|
if (this.level().isDay()) {
|
2021-08-06 22:37:38 +02:00
|
|
|
return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
|
|
|
|
} else {
|
2023-12-29 20:57:32 +01:00
|
|
|
@@ -2311,44 +2311,50 @@ public class ServerPlayer extends Player {
|
2021-08-06 22:37:38 +02:00
|
|
|
return this.respawnForced;
|
|
|
|
}
|
|
|
|
|
2024-01-19 13:22:30 +01:00
|
|
|
+ @Deprecated // Paper - Add PlayerSetSpawnEvent
|
2021-11-25 00:46:26 +01:00
|
|
|
public void setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage) {
|
2023-05-12 13:10:08 +02:00
|
|
|
- // CraftBukkit start
|
|
|
|
- this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, PlayerSpawnChangeEvent.Cause.UNKNOWN);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setRespawnPosition(ResourceKey<Level> resourcekey, @Nullable BlockPos blockposition, float f, boolean flag, boolean flag1, PlayerSpawnChangeEvent.Cause cause) {
|
|
|
|
- ServerLevel newWorld = this.server.getLevel(resourcekey);
|
|
|
|
- Location newSpawn = (blockposition != null) ? CraftLocation.toBukkit(blockposition, newWorld.getWorld(), f, 0) : null;
|
|
|
|
-
|
|
|
|
- PlayerSpawnChangeEvent event = new PlayerSpawnChangeEvent(this.getBukkitEntity(), newSpawn, flag, cause);
|
|
|
|
- Bukkit.getServer().getPluginManager().callEvent(event);
|
|
|
|
- if (event.isCancelled()) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- newSpawn = event.getNewSpawn();
|
|
|
|
- flag = event.isForced();
|
|
|
|
-
|
|
|
|
- if (newSpawn != null) {
|
|
|
|
- resourcekey = ((CraftWorld) newSpawn.getWorld()).getHandle().dimension();
|
|
|
|
- blockposition = BlockPos.containing(newSpawn.getX(), newSpawn.getY(), newSpawn.getZ());
|
|
|
|
- f = newSpawn.getYaw();
|
|
|
|
- } else {
|
|
|
|
- resourcekey = Level.OVERWORLD;
|
|
|
|
- blockposition = null;
|
|
|
|
- f = 0.0F;
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper start - Add PlayerSetSpawnEvent
|
2021-11-25 00:46:26 +01:00
|
|
|
+ this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.UNKNOWN);
|
2021-08-06 22:37:38 +02:00
|
|
|
+ }
|
2023-05-12 13:10:08 +02:00
|
|
|
+ @Deprecated
|
|
|
|
+ public boolean setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage, PlayerSpawnChangeEvent.Cause cause) {
|
|
|
|
+ return this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, cause == PlayerSpawnChangeEvent.Cause.RESET ?
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN : com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.valueOf(cause.name()));
|
|
|
|
+ }
|
2022-04-30 22:24:47 +02:00
|
|
|
+ public boolean setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause cause) {
|
2021-08-06 22:37:38 +02:00
|
|
|
+ Location spawnLoc = null;
|
|
|
|
+ boolean willNotify = false;
|
2023-05-12 13:10:08 +02:00
|
|
|
+ if (pos != null) {
|
|
|
|
+ boolean flag2 = pos.equals(this.respawnPosition) && dimension.equals(this.respawnDimension);
|
2022-10-24 21:43:46 +02:00
|
|
|
+ spawnLoc = io.papermc.paper.util.MCUtil.toLocation(this.getServer().getLevel(dimension), pos);
|
2021-08-06 22:37:38 +02:00
|
|
|
+ spawnLoc.setYaw(angle);
|
|
|
|
+ willNotify = sendMessage && !flag2;
|
|
|
|
+ }
|
2023-05-12 13:10:08 +02:00
|
|
|
+
|
|
|
|
+ PlayerSpawnChangeEvent dumbEvent = new PlayerSpawnChangeEvent(this.getBukkitEntity(), spawnLoc, forced,
|
|
|
|
+ cause == com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN ? PlayerSpawnChangeEvent.Cause.RESET : PlayerSpawnChangeEvent.Cause.valueOf(cause.name()));
|
|
|
|
+ dumbEvent.callEvent();
|
|
|
|
+
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerSetSpawnEvent event = new com.destroystokyo.paper.event.player.PlayerSetSpawnEvent(this.getBukkitEntity(), cause, dumbEvent.getNewSpawn(), dumbEvent.isForced(), willNotify, willNotify ? net.kyori.adventure.text.Component.translatable("block.minecraft.set_spawn") : null);
|
|
|
|
+ event.setCancelled(dumbEvent.isCancelled());
|
2021-08-06 22:37:38 +02:00
|
|
|
+ if (!event.callEvent()) {
|
2022-04-30 22:24:47 +02:00
|
|
|
+ return false;
|
2023-05-12 13:10:08 +02:00
|
|
|
}
|
|
|
|
- // CraftBukkit end
|
|
|
|
- if (blockposition != null) {
|
|
|
|
- boolean flag2 = blockposition.equals(this.respawnPosition) && resourcekey.equals(this.respawnDimension);
|
2021-08-06 22:37:38 +02:00
|
|
|
+ if (event.getLocation() != null) {
|
|
|
|
+ dimension = event.getLocation().getWorld() != null ? ((CraftWorld) event.getLocation().getWorld()).getHandle().dimension() : dimension;
|
2022-10-24 21:43:46 +02:00
|
|
|
+ pos = io.papermc.paper.util.MCUtil.toBlockPosition(event.getLocation());
|
2023-05-12 13:10:08 +02:00
|
|
|
+ angle = event.getLocation().getYaw();
|
2021-11-25 00:46:26 +01:00
|
|
|
+ forced = event.isForced();
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper end - Add PlayerSetSpawnEvent
|
2021-08-06 22:37:38 +02:00
|
|
|
|
2023-05-12 13:10:08 +02:00
|
|
|
- if (flag1 && !flag2) {
|
2022-06-08 11:31:06 +02:00
|
|
|
- this.sendSystemMessage(Component.translatable("block.minecraft.set_spawn"));
|
2024-01-19 13:22:30 +01:00
|
|
|
+ if (event.willNotifyPlayer() && event.getNotification() != null) { // Paper - Add PlayerSetSpawnEvent
|
|
|
|
+ this.sendSystemMessage(PaperAdventure.asVanilla(event.getNotification())); // Paper - Add PlayerSetSpawnEvent
|
2021-08-06 22:37:38 +02:00
|
|
|
}
|
|
|
|
|
2023-05-12 13:10:08 +02:00
|
|
|
- this.respawnPosition = blockposition;
|
|
|
|
- this.respawnDimension = resourcekey;
|
|
|
|
- this.respawnAngle = f;
|
|
|
|
- this.respawnForced = flag;
|
|
|
|
+ this.respawnPosition = pos;
|
|
|
|
+ this.respawnDimension = dimension;
|
|
|
|
+ this.respawnAngle = angle;
|
|
|
|
+ this.respawnForced = forced;
|
|
|
|
} else {
|
|
|
|
this.respawnPosition = null;
|
|
|
|
this.respawnDimension = Level.OVERWORLD;
|
2023-12-29 20:57:32 +01:00
|
|
|
@@ -2356,6 +2362,7 @@ public class ServerPlayer extends Player {
|
2022-04-30 22:24:47 +02:00
|
|
|
this.respawnForced = false;
|
|
|
|
}
|
|
|
|
|
2024-01-19 13:22:30 +01:00
|
|
|
+ return true; // Paper - Add PlayerSetSpawnEvent
|
2022-04-30 22:24:47 +02:00
|
|
|
}
|
|
|
|
|
2023-09-22 14:22:24 +02:00
|
|
|
public SectionPos getLastSectionPos() {
|
2021-08-06 22:37:38 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2024-01-19 17:54:05 +01:00
|
|
|
index 2a1b64e5d30cde7b2b2696a6cf5f3163071ab2d6..1bbcae2411205799b00dba7ee82c3ceb461289cf 100644
|
2021-08-06 22:37:38 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2024-01-16 19:27:39 +01:00
|
|
|
@@ -872,7 +872,7 @@ public abstract class PlayerList {
|
2023-05-12 13:10:08 +02:00
|
|
|
location = CraftLocation.toBukkit(vec3d, worldserver1.getWorld(), f1, 0.0F);
|
2022-04-30 22:24:47 +02:00
|
|
|
} else if (blockposition != null) {
|
|
|
|
entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
|
2023-05-12 13:10:08 +02:00
|
|
|
- entityplayer1.setRespawnPosition(null, null, 0f, false, false, PlayerSpawnChangeEvent.Cause.RESET); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed
|
2024-01-19 13:22:30 +01:00
|
|
|
+ entityplayer1.setRespawnPosition(null, null, 0f, false, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed // Paper - Add PlayerSetSpawnEvent
|
2022-04-30 22:24:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-08-06 22:37:38 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
|
2024-01-19 13:22:30 +01:00
|
|
|
index ecaa7f0b2bf795f16187f11fa27f6d5d435ccbfe..acd5ec218b8d4c096f44ae2eec1379eeaf30ddc5 100644
|
2021-08-06 22:37:38 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
|
2023-12-06 04:57:46 +01:00
|
|
|
@@ -87,9 +87,14 @@ public class RespawnAnchorBlock extends Block {
|
2023-05-12 13:10:08 +02:00
|
|
|
ServerPlayer entityplayer = (ServerPlayer) player;
|
|
|
|
|
|
|
|
if (entityplayer.getRespawnDimension() != world.dimension() || !pos.equals(entityplayer.getRespawnPosition())) {
|
|
|
|
- entityplayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true, org.bukkit.event.player.PlayerSpawnChangeEvent.Cause.RESPAWN_ANCHOR); // CraftBukkit
|
2024-01-19 13:22:30 +01:00
|
|
|
+ if (entityplayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.RESPAWN_ANCHOR)) { // Paper - Add PlayerSetSpawnEvent
|
2023-05-12 13:10:08 +02:00
|
|
|
world.playSound((Player) null, (double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, SoundEvents.RESPAWN_ANCHOR_SET_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F);
|
2021-08-06 22:37:38 +02:00
|
|
|
return InteractionResult.SUCCESS;
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper start - Add PlayerSetSpawnEvent
|
2022-04-30 22:24:47 +02:00
|
|
|
+ } else {
|
|
|
|
+ return InteractionResult.FAIL;
|
|
|
|
+ }
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper end - Add PlayerSetSpawnEvent
|
2021-08-06 22:37:38 +02:00
|
|
|
}
|
2022-04-30 22:24:47 +02:00
|
|
|
}
|
|
|
|
|
2021-08-06 22:37:38 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2024-01-19 17:54:05 +01:00
|
|
|
index f1b52cccb8bb82def47c6dee8a63d51a095c112b..4475a59e867b0e2f64cdac41911af0e7fe721ad2 100644
|
2021-08-06 22:37:38 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -1318,9 +1318,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-08-06 22:37:38 +02:00
|
|
|
@Override
|
|
|
|
public void setBedSpawnLocation(Location location, boolean override) {
|
|
|
|
if (location == null) {
|
2023-05-12 13:10:08 +02:00
|
|
|
- this.getHandle().setRespawnPosition(null, null, 0.0F, override, false, PlayerSpawnChangeEvent.Cause.PLUGIN);
|
2024-01-19 13:22:30 +01:00
|
|
|
+ this.getHandle().setRespawnPosition(null, null, 0.0F, override, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLUGIN); // Paper - Add PlayerSetSpawnEvent
|
2021-08-06 22:37:38 +02:00
|
|
|
} else {
|
2023-05-12 13:10:08 +02:00
|
|
|
- this.getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().dimension(), CraftLocation.toBlockPosition(location), location.getYaw(), override, false, PlayerSpawnChangeEvent.Cause.PLUGIN);
|
2024-01-19 13:22:30 +01:00
|
|
|
+ this.getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().dimension(), CraftLocation.toBlockPosition(location), location.getYaw(), override, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLUGIN); // Paper - Add PlayerSetSpawnEvent
|
2021-08-06 22:37:38 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|