2021-06-11 14:02:28 +02: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-11-29 12:55:13 +01:00
|
|
|
index 38f0f98c2191bfe36c3547501e49680faef50403..1a52902d80d5abf2d914f7b49ab461cb3cda8d80 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2021-11-25 12:20:13 +01:00
|
|
|
@@ -874,7 +874,7 @@ public abstract class PlayerList {
|
2021-06-11 14:02:28 +02: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-20 21:25:59 +02:00
|
|
|
Player respawnPlayer = entityplayer1.getBukkitEntity();
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2021-11-28 04:24:49 +01:00
|
|
|
index f850aefb042660e6df423a19907a096a3a7c1d77..4224f6c5d219285c10c1dae18375ee553052510b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2021-11-28 04:24:49 +01:00
|
|
|
@@ -238,7 +238,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2021-06-11 14:02:28 +02:00
|
|
|
@Override
|
|
|
|
public Location getSpawnLocation() {
|
2021-06-14 18:58:00 +02:00
|
|
|
BlockPos spawn = this.world.getSharedSpawnPos();
|
2021-06-11 14:02:28 +02: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
|