-
-
Notifications
You must be signed in to change notification settings - Fork 360
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6a209ef
commit c835ce8
Showing
2 changed files
with
45 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.16.4--c3c709479fe76495ed3f5f8df48b259a703229c5 | ||
1.16.4--d2bbd0bffbf55522a72f1fcb7556c33f0484ec8d |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java | ||
index 8798660225..7b385eb43e 100644 | ||
--- a/src/main/java/net/minecraft/server/PlayerList.java | ||
+++ b/src/main/java/net/minecraft/server/PlayerList.java | ||
@@ -813,7 +813,7 @@ public abstract class PlayerList { | ||
if (location == null) { | ||
worldserver1 = this.server.getWorldServer(World.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.worldData.getSpawnAngle(), 0.0F); // Paper - use world spawn angle | ||
} | ||
|
||
Player respawnPlayer = cserver.getPlayer(entityplayer1); | ||
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java | ||
index faf931785e..14e1762bf8 100644 | ||
--- a/src/main/java/net/minecraft/server/WorldData.java | ||
+++ b/src/main/java/net/minecraft/server/WorldData.java | ||
@@ -8,6 +8,7 @@ public interface WorldData { | ||
|
||
int c(); | ||
|
||
+ default float getSpawnAngle() { return d(); } // Paper - OBFHELPER | ||
float d(); | ||
|
||
long getTime(); | ||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java | ||
index 2028db6da4..ae2cc01c10 100644 | ||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java | ||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java | ||
@@ -387,7 +387,7 @@ public class CraftWorld implements World { | ||
@Override | ||
public Location getSpawnLocation() { | ||
BlockPosition spawn = world.getSpawn(); | ||
- return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ()); | ||
+ return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ(), world.worldData.getSpawnAngle(), 0.0F); // Paper - expose world spawn angle | ||
} | ||
|
||
@Override |