From dc0b85c23bed3e2b2c132f3199899d3159c2a1fc Mon Sep 17 00:00:00 2001 From: Daniil Date: Fri, 10 Aug 2018 03:34:11 +0700 Subject: [PATCH] Reverted location-fix --- core/src/main/java/mc/core/WarpPosition.java | 4 ++-- core/src/main/java/mc/core/embedded/FakePlayerManager.java | 4 ++-- core/src/main/java/mc/core/events/PlayerLookEvent.java | 4 ++-- core/src/main/java/mc/core/player/ILook.java | 6 ++++-- .../src/main/java/mc/core/player/InMemoryPlayerManager.java | 2 +- core/src/main/java/mc/core/player/Look.java | 6 +++--- core/src/main/java/mc/core/player/Player.java | 2 +- core/src/main/java/mc/core/player/PlayerManager.java | 2 +- core/src/main/java/mc/core/player/SimplePlayer.java | 4 ++-- .../proto_1_12_2/packets/PlayerPositionAndLookPacket.java | 3 +-- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/mc/core/WarpPosition.java b/core/src/main/java/mc/core/WarpPosition.java index c23325e..4a0e501 100644 --- a/core/src/main/java/mc/core/WarpPosition.java +++ b/core/src/main/java/mc/core/WarpPosition.java @@ -36,7 +36,7 @@ public class WarpPosition extends Location implements Serializable, ILook { super(location.getX(), location.getY(), location.getZ()); } - public WarpPosition(Location location, ILook look) { + public WarpPosition(Location location, Look look) { super(location.getX(), location.getY(), location.getZ()); this.look = look; } @@ -46,7 +46,7 @@ public class WarpPosition extends Location implements Serializable, ILook { } @Override - public void set(ILook look) { + public void set(Look look) { this.look = look; } diff --git a/core/src/main/java/mc/core/embedded/FakePlayerManager.java b/core/src/main/java/mc/core/embedded/FakePlayerManager.java index 061497a..10a8ea5 100644 --- a/core/src/main/java/mc/core/embedded/FakePlayerManager.java +++ b/core/src/main/java/mc/core/embedded/FakePlayerManager.java @@ -8,7 +8,7 @@ import mc.core.Location; import mc.core.chat.MessageType; import mc.core.network.NetChannel; import mc.core.network.SCPacket; -import mc.core.player.ILook; +import mc.core.player.Look; import mc.core.player.Player; import mc.core.player.PlayerManager; import mc.core.text.Text; @@ -52,7 +52,7 @@ public class FakePlayerManager implements PlayerManager { private static final NetChannel FAKE_NET_CHANNEL = new FakeNetChannet(); @Override - public Player createPlayer(String name, Location defaultLocation, ILook defaultLook) { + public Player createPlayer(String name, Location defaultLocation, Look defaultLook) { return null; } diff --git a/core/src/main/java/mc/core/events/PlayerLookEvent.java b/core/src/main/java/mc/core/events/PlayerLookEvent.java index fc4734f..2d03b0b 100644 --- a/core/src/main/java/mc/core/events/PlayerLookEvent.java +++ b/core/src/main/java/mc/core/events/PlayerLookEvent.java @@ -7,7 +7,7 @@ package mc.core.events; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import mc.core.player.ILook; +import mc.core.player.Look; import mc.core.player.Player; @RequiredArgsConstructor @@ -15,5 +15,5 @@ import mc.core.player.Player; @Setter public class PlayerLookEvent extends EventBase { private final Player player; - private ILook newLook; + private Look newLook; } diff --git a/core/src/main/java/mc/core/player/ILook.java b/core/src/main/java/mc/core/player/ILook.java index e0981bf..fdebd51 100644 --- a/core/src/main/java/mc/core/player/ILook.java +++ b/core/src/main/java/mc/core/player/ILook.java @@ -1,7 +1,9 @@ package mc.core.player; -public interface ILook { - void set(ILook look); +import java.io.Serializable; + +public interface ILook extends Serializable { + void set(Look look); float getYaw(); diff --git a/core/src/main/java/mc/core/player/InMemoryPlayerManager.java b/core/src/main/java/mc/core/player/InMemoryPlayerManager.java index bf62814..0ba717c 100644 --- a/core/src/main/java/mc/core/player/InMemoryPlayerManager.java +++ b/core/src/main/java/mc/core/player/InMemoryPlayerManager.java @@ -31,7 +31,7 @@ public class InMemoryPlayerManager implements PlayerManager, Runnable { } @Override - public Player createPlayer(String name, Location defaultLocation, ILook defaultLook) { + public Player createPlayer(String name, Location defaultLocation, Look defaultLook) { SimplePlayer player = new SimplePlayer(); player.setId(rand.nextInt(10000)); player.setUUID(UUID.nameUUIDFromBytes(name.getBytes())); diff --git a/core/src/main/java/mc/core/player/Look.java b/core/src/main/java/mc/core/player/Look.java index a13da39..f15f6f7 100644 --- a/core/src/main/java/mc/core/player/Look.java +++ b/core/src/main/java/mc/core/player/Look.java @@ -13,8 +13,8 @@ public class Look implements ILook { private float yaw, pitch; @Override - public void set(ILook look) { - this.yaw = look.getYaw(); - this.pitch = look.getPitch(); + public void set(Look look) { + this.yaw = look.yaw; + this.pitch = look.pitch; } } diff --git a/core/src/main/java/mc/core/player/Player.java b/core/src/main/java/mc/core/player/Player.java index ababfb0..0b0e2c2 100644 --- a/core/src/main/java/mc/core/player/Player.java +++ b/core/src/main/java/mc/core/player/Player.java @@ -20,7 +20,7 @@ public interface Player { Location getLocation(); - ILook getLook(); + Look getLook(); boolean isFlying(); void setFlying(boolean value); diff --git a/core/src/main/java/mc/core/player/PlayerManager.java b/core/src/main/java/mc/core/player/PlayerManager.java index aa63e66..8dd1c7a 100644 --- a/core/src/main/java/mc/core/player/PlayerManager.java +++ b/core/src/main/java/mc/core/player/PlayerManager.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Optional; public interface PlayerManager { - Player createPlayer(String name, Location defaultLocation, ILook defaultLook); + Player createPlayer(String name, Location defaultLocation, Look defaultLook); void joinServer(Player player); void leftServer(Player player); Optional getPlayer(String name); diff --git a/core/src/main/java/mc/core/player/SimplePlayer.java b/core/src/main/java/mc/core/player/SimplePlayer.java index a918971..f841595 100644 --- a/core/src/main/java/mc/core/player/SimplePlayer.java +++ b/core/src/main/java/mc/core/player/SimplePlayer.java @@ -18,7 +18,7 @@ public class SimplePlayer implements Player { private boolean online = false; private NetChannel channel; private Location location = new Location(0, 0, 0); - private ILook look = new Look(0, 0); + private Look look = new Look(0, 0); private boolean flying = false; private PlayerSettings settings; @@ -26,7 +26,7 @@ public class SimplePlayer implements Player { this.location.set(location); } - public void setLook(ILook look) { + public void setLook(Look look) { this.look.set(look); } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java index 1255e0c..4133bbe 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java @@ -10,7 +10,6 @@ import lombok.Setter; import lombok.ToString; import mc.core.Location; import mc.core.network.*; -import mc.core.player.ILook; import mc.core.player.Look; @NoArgsConstructor @@ -19,7 +18,7 @@ import mc.core.player.Look; @ToString public class PlayerPositionAndLookPacket implements SCPacket, CSPacket { private Location location; - private ILook look; + private Look look; private int teleportId; private boolean onGround = false;