From 35f45ac7ae29b0ec3614ad0daa6f15d45f854499 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Fri, 22 May 2020 06:43:25 -0500 Subject: [PATCH] Spawn locating mappings (#1386) SpawnLocating and ServerPlayerEntity must be in same package Signed-off-by: liach Co-authored-by: liach --- .../server/network/ServerPlayerEntity.mapping | 3 +++ .../server/network/SpawnLocating.mapping | 21 +++++++++++++++++++ .../server/world/ServerWorld.mapping | 1 + 3 files changed, 25 insertions(+) create mode 100644 mappings/net/minecraft/server/network/SpawnLocating.mapping diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index b5916cd92e..d0c1f9d2f4 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 server ARG 2 world ARG 3 profile + ARG 4 interactionManager METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V ARG 1 oldPlayer ARG 2 alive @@ -80,6 +81,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14240 onTeleportationDone ()V METHOD method_14241 updateCursorStack ()V METHOD method_14242 getCameraEntity ()Lnet/minecraft/class_1297; + METHOD method_14244 calculateSpawnOffsetMultiplier (I)I + ARG 1 horizontalSpawnArea METHOD method_14245 moveToSpawn (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_14246 sendUnloadChunkPacket (Lnet/minecraft/class_1923;)V diff --git a/mappings/net/minecraft/server/network/SpawnLocating.mapping b/mappings/net/minecraft/server/network/SpawnLocating.mapping new file mode 100644 index 0000000000..7b95683dba --- /dev/null +++ b/mappings/net/minecraft/server/network/SpawnLocating.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_5322 net/minecraft/server/network/SpawnLocating + METHOD method_29194 findOverworldSpawn (Lnet/minecraft/class_3218;IIZ)Lnet/minecraft/class_2338; + ARG 0 world + ARG 1 x + ARG 2 z + ARG 3 validSpawnNeeded + METHOD method_29195 findEndSpawn (Lnet/minecraft/class_3218;JII)Lnet/minecraft/class_2338; + ARG 0 world + ARG 1 seed + ARG 3 x + ARG 4 z + METHOD method_29196 findServerSpawnPoint (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;Z)Lnet/minecraft/class_2338; + ARG 0 world + ARG 1 chunkPos + ARG 2 validSpawnNeeded + METHOD method_29197 findPlayerSpawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;III)Lnet/minecraft/class_2338; + ARG 0 world + ARG 1 pos + ARG 2 negativeOffset + ARG 3 xOffset + ARG 4 zOffset diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index dd606266c9..525767f92b 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -149,6 +149,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_24500 locateBiome (Lnet/minecraft/class_1959;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338; METHOD method_27056 getStructureAccessor ()Lnet/minecraft/class_5138; METHOD method_27909 iterateEntities ()Ljava/lang/Iterable; + METHOD method_27911 getSpawnPos ()Lnet/minecraft/class_2338; METHOD method_8416 addLightning (Lnet/minecraft/class_1538;)V METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;