Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-01 00:10:32 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup patch import

Browse Source
This commit is contained in:
Cryptite 2023-05-01 16:37:19 -05:00
parent 3581968d64
commit 8f484c655f
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0977-Add-PlayerGetRespawnLocationEvent.patch
View File

@ -5,18 +5,10 @@ Subject: [PATCH] Add PlayerGetRespawnLocationEvent
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..5074e3eeaff73900ec5a48282fa3f2b842a6594c 100644 index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..4395dccb63e38289f5f158fd941615cc6a1df0c3 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1,6 +1,7 @@ @@ -118,7 +118,6 @@ import org.bukkit.Location;
package net.minecraft.server.players;
import co.aikar.timings.MinecraftTimings;
+import com.destroystokyo.paper.event.player.PlayerGetRespawnLocationEvent;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -118,7 +119,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;
@ -24,7 +16,7 @@ index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..5074e3eeaff73900ec5a48282fa3f2b8
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
@@ -835,49 +835,57 @@ public abstract class PlayerList { @@ -835,49 +834,57 @@ public abstract class PlayerList {
// CraftBukkit start - fire PlayerRespawnEvent // CraftBukkit start - fire PlayerRespawnEvent
if (location == null) { if (location == null) {
@ -34,7 +26,7 @@ index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..5074e3eeaff73900ec5a48282fa3f2b8
- Optional optional; - Optional optional;
+ // Paper start + // Paper start
+ Player respawnPlayer = entityplayer1.getBukkitEntity(); + Player respawnPlayer = entityplayer1.getBukkitEntity();
+ PlayerGetRespawnLocationEvent preRespawnEvent = new PlayerGetRespawnLocationEvent(respawnPlayer); + com.destroystokyo.paper.event.player.PlayerGetRespawnLocationEvent preRespawnEvent = new com.destroystokyo.paper.event.player.PlayerGetRespawnLocationEvent(respawnPlayer);
+ preRespawnEvent.callEvent(); + preRespawnEvent.callEvent();
+ location = preRespawnEvent.getRespawnLocation(); + location = preRespawnEvent.getRespawnLocation();