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-11-25 08:54:06 +00:00
|
|
|
index 6aaa5174bb0eff3216667b4c8d3912d02e1c66e2..388e02966660b42d812a89ad290a4b94b450b5fe 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-11-25 08:54:06 +00:00
|
|
|
@@ -873,7 +873,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-20 19:25:59 +00:00
|
|
|
Player respawnPlayer = entityplayer1.getBukkitEntity();
|
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-11-25 08:54:06 +00:00
|
|
|
index b2efce98e8d6f5297646e4f270bc2d5cc7e182f0..4e6d24ce3e14ad56b2e926d6b4aea36f882f5bf3 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-10-05 03:14:11 +00:00
|
|
|
@@ -236,7 +236,7 @@ public class CraftWorld extends CraftRegionAccessor 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
|