testserver/patches/server/0556-Expose-world-spawn-ang...

33 lines
2.1 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Tue, 17 Nov 2020 19:13:09 +0200
Subject: [PATCH] Expose world spawn angle
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
2021-06-17 08:37:27 +00:00
index 24a1f72fa81584dcdb447a4e2d1d68462c6357ee..1c6ea9dd4335c573d6f83d38f77470333139580b 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
2021-06-17 08:37:27 +00:00
@@ -866,7 +866,7 @@ public abstract class PlayerList {
2021-06-11 12:02:28 +00:00
if (location == null) {
worldserver1 = this.server.getLevel(Level.OVERWORLD);
blockposition = entityplayer1.getSpawnPoint(worldserver1);
- location = new Location(worldserver1.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.1F), (double) ((float) blockposition.getZ() + 0.5F));
+ location = new Location(worldserver1.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.1F), (double) ((float) blockposition.getZ() + 0.5F), worldserver1.levelData.getSpawnAngle(), 0.0F); // Paper - use world spawn angle
}
2021-06-14 16:58:00 +00:00
Player respawnPlayer = this.cserver.getPlayer(entityplayer1);
2021-06-11 12:02:28 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2021-06-16 10:14:53 +00:00
index 99e0413cad2bca77e80ea67aaeb78ebb25e6f896..612f707bfc8179c143cb9c1c70b305464598b815 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2021-06-14 16:58:00 +00:00
@@ -377,7 +377,7 @@ public class CraftWorld implements World {
2021-06-11 12:02:28 +00:00
@Override
public Location getSpawnLocation() {
2021-06-14 16:58:00 +00:00
BlockPos spawn = this.world.getSharedSpawnPos();
2021-06-11 12:02:28 +00:00
- return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ());
+ return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ(), world.levelData.getSpawnAngle(), 0.0F); // Paper - expose world spawn angle
}
@Override