From 4a5f5cf721dc0a8b8673f62cb226957c85e6a0ee Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 23 May 2018 15:42:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D1=87=D0=B5=D0=BC=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=BC=20Location.copy(),=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20Location.set()=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/mc/core/Location.java | 4 ---- core/src/main/java/mc/core/player/InMemoryPlayerManager.java | 4 ++-- core/src/main/java/mc/core/player/Look.java | 4 ---- core/src/main/java/mc/core/player/Player.java | 2 -- core/src/main/java/mc/core/player/SimplePlayer.java | 4 ++-- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/mc/core/Location.java b/core/src/main/java/mc/core/Location.java index fb3676b..959f141 100644 --- a/core/src/main/java/mc/core/Location.java +++ b/core/src/main/java/mc/core/Location.java @@ -12,10 +12,6 @@ import lombok.Data; public class Location { private double x, y, z; - public static Location copy(Location location) { - return new Location(location.x, location.y, location.z); - } - public void set(Location location) { this.x = location.x; this.y = location.y; diff --git a/core/src/main/java/mc/core/player/InMemoryPlayerManager.java b/core/src/main/java/mc/core/player/InMemoryPlayerManager.java index a873c2c..10b1b0e 100644 --- a/core/src/main/java/mc/core/player/InMemoryPlayerManager.java +++ b/core/src/main/java/mc/core/player/InMemoryPlayerManager.java @@ -35,8 +35,8 @@ public class InMemoryPlayerManager implements PlayerManager, Runnable { SimplePlayer player = new SimplePlayer(); player.setId(rand.nextInt(10000)); player.setName(name); - player.setLocation(defaultLocation); - player.setLook(defaultLook); + player.getLocation().set(defaultLocation); + player.getLook().set(defaultLook); synchronized (lock) { players.add(player); diff --git a/core/src/main/java/mc/core/player/Look.java b/core/src/main/java/mc/core/player/Look.java index 4c81081..9335111 100644 --- a/core/src/main/java/mc/core/player/Look.java +++ b/core/src/main/java/mc/core/player/Look.java @@ -12,10 +12,6 @@ import lombok.Data; public class Look { private float yaw, pitch; - public static Look copy(Look look) { - return new Look(look.yaw, look.pitch); - } - 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 5272578..84e894e 100644 --- a/core/src/main/java/mc/core/player/Player.java +++ b/core/src/main/java/mc/core/player/Player.java @@ -16,10 +16,8 @@ public interface Player { void setChannel(NetChannel channel); Location getLocation(); - void setLocation(Location location); Look getLook(); - void setLook(Look look); boolean isFlying(); void setFlying(boolean value); diff --git a/core/src/main/java/mc/core/player/SimplePlayer.java b/core/src/main/java/mc/core/player/SimplePlayer.java index 97c679a..430fac2 100644 --- a/core/src/main/java/mc/core/player/SimplePlayer.java +++ b/core/src/main/java/mc/core/player/SimplePlayer.java @@ -19,10 +19,10 @@ public class SimplePlayer implements Player { private boolean flying = false; public void setLocation(Location location) { - this.location = Location.copy(location); + this.location.set(location); } public void setLook(Look look) { - this.look = Look.copy(look); + this.look.set(look); } }