diff --git a/core/src/main/java/mc/core/EntityLocation.java b/core/src/main/java/mc/core/EntityLocation.java index 485d067..0614b85 100644 --- a/core/src/main/java/mc/core/EntityLocation.java +++ b/core/src/main/java/mc/core/EntityLocation.java @@ -10,7 +10,7 @@ import mc.core.world.block.BlockLocation; @NoArgsConstructor @AllArgsConstructor @Data -public class EntityLocation implements Cloneable { +public class EntityLocation { private double x, y, z; private float yaw, pitch; @@ -50,13 +50,7 @@ public class EntityLocation implements Cloneable { return new BlockLocation(getBlockX(), getBlockY(), getBlockZ()); } - @Override - public EntityLocation clone() { - try { - return (EntityLocation) super.clone(); - } catch (CloneNotSupportedException e) { - log.error("", e); - return ZERO(); - } + public EntityLocation copy() { + return new EntityLocation(x, y, z, yaw, pitch); } } diff --git a/core/src/main/java/mc/core/world/block/BlockLocation.java b/core/src/main/java/mc/core/world/block/BlockLocation.java index aa9a038..ddf36e4 100644 --- a/core/src/main/java/mc/core/world/block/BlockLocation.java +++ b/core/src/main/java/mc/core/world/block/BlockLocation.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; @NoArgsConstructor @AllArgsConstructor @Data -public class BlockLocation implements Cloneable { +public class BlockLocation { private int x, y, z; public static BlockLocation ZERO() { @@ -22,13 +22,7 @@ public class BlockLocation implements Cloneable { this.z = z; } - @Override - public BlockLocation clone() { - try { - return (BlockLocation) super.clone(); - } catch (CloneNotSupportedException e) { - log.error("", e); - return ZERO(); - } + public BlockLocation copy() { + return new BlockLocation(x, y, z); } } diff --git a/core/src/test/java/mc/core/EntityLocationTest.java b/core/src/test/java/mc/core/EntityLocationTest.java index 0e31fdc..36b5254 100644 --- a/core/src/test/java/mc/core/EntityLocationTest.java +++ b/core/src/test/java/mc/core/EntityLocationTest.java @@ -37,9 +37,9 @@ class EntityLocationTest { } @Test - void clone_() { + void copy() { EntityLocation locOrig = new EntityLocation(x, y, z, yaw, pitch); - EntityLocation locClone = locOrig.clone(); + EntityLocation locClone = locOrig.copy(); assertEquals(locOrig, locClone); assertNotSame(locOrig, locClone); } diff --git a/core/src/test/java/mc/core/ImmutableEntityLocationTest.java b/core/src/test/java/mc/core/ImmutableEntityLocationTest.java index 0335538..f631530 100644 --- a/core/src/test/java/mc/core/ImmutableEntityLocationTest.java +++ b/core/src/test/java/mc/core/ImmutableEntityLocationTest.java @@ -26,7 +26,7 @@ class ImmutableEntityLocationTest { @Test void clone_() { EntityLocation locOrig = new ImmutableEntityLocation(1d, 2d, 3d, 4f, 5f); - EntityLocation locClone = locOrig.clone(); + EntityLocation locClone = locOrig.copy(); assertEquals(locOrig, locClone); } diff --git a/core/src/test/java/mc/core/world/block/BlockLocationTest.java b/core/src/test/java/mc/core/world/block/BlockLocationTest.java index d716995..608cfbc 100644 --- a/core/src/test/java/mc/core/world/block/BlockLocationTest.java +++ b/core/src/test/java/mc/core/world/block/BlockLocationTest.java @@ -31,9 +31,9 @@ class BlockLocationTest { } @Test - void clone_() { + void copy() { BlockLocation locOrig = new BlockLocation(x, y, z); - BlockLocation locClone = locOrig.clone(); + BlockLocation locClone = locOrig.copy(); assertEquals(locOrig, locClone); } } diff --git a/h2_playermanager/src/main/java/mc/core/h2db/H2PlayerManager.java b/h2_playermanager/src/main/java/mc/core/h2db/H2PlayerManager.java index b22699c..7ebeb86 100644 --- a/h2_playermanager/src/main/java/mc/core/h2db/H2PlayerManager.java +++ b/h2_playermanager/src/main/java/mc/core/h2db/H2PlayerManager.java @@ -12,7 +12,6 @@ import mc.core.player.PlayerManager; import mc.core.player.PlayerSettings; import mc.core.world.World; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; import java.util.*; @@ -30,7 +29,7 @@ public class H2PlayerManager implements PlayerManager { H2Player h2Player = new H2Player(); h2Player.setName(name); h2Player.setUuid(UUID.randomUUID()); - h2Player.setLocation(location.clone()); + h2Player.setLocation(location.copy()); h2Player.setLoadedChunks(new ArrayList<>()); h2Player.setWorld(world); h2Player.setSettings(new PlayerSettings()); diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/TeleportManager.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/TeleportManager.java index 288d610..27cb484 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/TeleportManager.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/TeleportManager.java @@ -34,7 +34,7 @@ public class TeleportManager { teleportId = RAND.nextInt(9999); } while (teleportMap.containsKey(teleportId)); - teleportMap.put(teleportId, new TpData(player, location.clone())); + teleportMap.put(teleportId, new TpData(player, location.copy())); return teleportId; } diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java index 90c4ce5..62d3861 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java @@ -74,7 +74,7 @@ public class PlayHandler extends AbstractStateHandler implements PlayStateHandle return; } - CS_PlayerMoveEvent event = new CS_PlayerMoveEvent(player, player.getLocation().clone()); + CS_PlayerMoveEvent event = new CS_PlayerMoveEvent(player, player.getLocation().copy()); event.setNewLocation(new EntityLocation( packet.getX(), packet.getY(), packet.getZ(), player.getLocation().getYaw(),