Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-07-02 17:34:55 +02:00
Code Issues Projects Releases Wiki Activity

Make init function UNSAFE

Browse Source
This commit is contained in:
LeoDog896 2021-01-18 10:44:12 -05:00
parent 4aed6ffa5c
commit 78abfb9657
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minestom/server/entity/Player.java
View File

@ -229,10 +229,11 @@ public class Player extends LivingEntity implements CommandSender {
* Init the player and spawn him. * Init the player and spawn him.
* <p> * <p>
* WARNING: executed in the main update thread * WARNING: executed in the main update thread
* UNSAFE: Only meant to be used when a netty player connects through the server.
* *
* @param spawnInstance the player spawn instance (defined in {@link PlayerLoginEvent}) * @param spawnInstance the player spawn instance (defined in {@link PlayerLoginEvent})
*/ */
public void init(@NotNull Instance spawnInstance) { public void UNSAFE_init(@NotNull Instance spawnInstance) {
this.dimensionType = spawnInstance.getDimensionType(); this.dimensionType = spawnInstance.getDimensionType();
JoinGamePacket joinGamePacket = new JoinGamePacket(); JoinGamePacket joinGamePacket = new JoinGamePacket();

2
src/main/java/net/minestom/server/network/ConnectionManager.java
View File

@ -503,7 +503,7 @@ public final class ConnectionManager {
Check.notNull(spawningInstance, "You need to specify a spawning instance in the PlayerLoginEvent"); Check.notNull(spawningInstance, "You need to specify a spawning instance in the PlayerLoginEvent");
waitingPlayer.init(spawningInstance); waitingPlayer.UNSAFE_init(spawningInstance);
// Spawn the player at Player#getRespawnPoint during the next instance tick // Spawn the player at Player#getRespawnPoint during the next instance tick
spawningInstance.scheduleNextTick(waitingPlayer::setInstance); spawningInstance.scheduleNextTick(waitingPlayer::setInstance);