13
0
geforkt von Mirrors/Paper

fix: null SpawnReason for new player (#9015)

Dieser Commit ist enthalten in:
elmital 2023-04-02 20:37:53 +02:00
Ursprung b46708d565
Commit 7d091ee970
2 geänderte Dateien mit 17 neuen und 6 gelöschten Zeilen

Datei anzeigen

@ -39,11 +39,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -0,0 +0,0 @@ public abstract class PlayerList {
worldserver1 = worldserver;
// Paper
if (nbttagcompound == null) {
player.spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT; // set Player SpawnReason to DEFAULT on first login
+ player.fudgeSpawnLocation(worldserver1); // only move to spawn on first login, otherwise, stay where you are....
}
+ if (nbttagcompound == null) player.fudgeSpawnLocation(worldserver1); // Paper - only move to spawn on first login, otherwise, stay where you are....
+
// Paper
player.setLevel(worldserver1);
String s1 = "local";

Datei anzeigen

@ -25,6 +25,18 @@ diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/ma
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -0,0 +0,0 @@ public abstract class PlayerList {
worldserver1 = worldserver;
}
+ // Paper
+ if (nbttagcompound == null) {
+ player.spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT; // set Player SpawnReason to DEFAULT on first login
+ }
+ // Paper
player.setLevel(worldserver1);
String s1 = "local";
@@ -0,0 +0,0 @@ public abstract class PlayerList {
// CraftBukkit start
ServerLevel finalWorldServer = worldserver1;