Skip to content

Refactor RespawnLocation to extend UnloadedWorldLocation to reduce du… #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 1 commit into from
Dec 8, 2025
Merged

Refactor RespawnLocation to extend UnloadedWorldLocation to reduce du… #645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 13 additions & 98 deletions src/main/java/org/mvplugins/multiverse/inventories/util/RespawnLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.mvplugins.multiverse.inventories.util;

import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Utility;
Expand All @@ -12,102 +11,51 @@
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.mvplugins.multiverse.core.world.location.UnloadedWorldLocation;
import org.mvplugins.multiverse.external.vavr.control.Try;

import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;

/**
* Location information with respawn type. See also {@link RespawnLocationType}.
* <br />
* TODO: This should extend UnloadedWorldLocation, but that class is currently a final class!!!
*/
@SerializableAs("RespawnLocation")
@ApiStatus.AvailableSince("5.2")
public class RespawnLocation extends Location {
public class RespawnLocation extends UnloadedWorldLocation {

private @Nullable String worldName;
private @NotNull RespawnLocationType respawnType = RespawnLocationType.UNKNOWN;
private @NotNull RespawnLocationType respawnType;

public RespawnLocation(@Nullable String worldName, double x, double y, double z, @NotNull RespawnLocationType respawnType) {
super(null, x, y, z);
setWorldName(worldName);
super(worldName, x, y, z);
this.respawnType = respawnType;
}

public RespawnLocation(@Nullable String worldName, double x, double y, double z, float yaw, float pitch, @NotNull RespawnLocationType respawnType) {
super(null, x, y, z, yaw, pitch);
setWorldName(worldName);
super(worldName, x, y, z, yaw, pitch);
this.respawnType = respawnType;
}

public RespawnLocation(@Nullable World world, double x, double y, double z, @NotNull RespawnLocationType respawnType) {
super(null, x, y, z);
setWorldName(world == null ? null : world.getName());
super(world, x, y, z);
this.respawnType = respawnType;
}

public RespawnLocation(@Nullable World world, double x, double y, double z, float yaw, float pitch, @NotNull RespawnLocationType respawnType) {
super(null, x, y, z, yaw, pitch);
setWorldName(world == null ? null : world.getName());
super(world, x, y, z, yaw, pitch);
this.respawnType = respawnType;
}

public RespawnLocation(@NotNull Location location, @NotNull RespawnLocationType respawnType) {
this(location.getWorld(), location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch(), respawnType);
}

/**
* Makes a bukkit {@link Location} copy from this SpawnLocation.
*
* @return The bukkit location
*/
public Location toBukkitLocation() {
return new Location(getWorld(), getX(), getY(), getZ(), getYaw(), getPitch());
}

public void setWorldName(@Nullable String worldName) {
this.worldName = worldName;
}

public @Nullable String getWorldName() {
return worldName;
}

@Override
public void setWorld(@Nullable World world) {
this.worldName = (world == null) ? null : world.getName();
}

@Override
public @Nullable World getWorld() {
if (worldName == null) {
return null;
}
return Bukkit.getWorld(worldName);
}

@Override
@Utility
@NotNull
public Map<String, Object> serialize() {
Map<String, Object> data = new HashMap<>();

if (this.worldName != null) {
data.put("world", this.worldName);
}

data.put("x", getX());
data.put("y", getY());
data.put("z", getZ());

data.put("yaw", getYaw());
data.put("pitch", getPitch());

Map<String, Object> data = super.serialize();
data.put("respawnType", this.respawnType.name());

return data;
}

Expand Down Expand Up @@ -138,58 +86,25 @@ public static Location deserialize(@NotNull Map<String, Object> args) {

@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (!(obj instanceof Location other)) {
return false;
}
String otherWorldName = Try.of(() -> other instanceof RespawnLocation RespawnLocation
? RespawnLocation.worldName
: other.getWorld().getName())
.getOrNull();
if (!Objects.equals(this.worldName, otherWorldName)) {
return false;
}
if (Double.doubleToLongBits(this.getX()) != Double.doubleToLongBits(other.getX())) {
return false;
}
if (Double.doubleToLongBits(this.getY()) != Double.doubleToLongBits(other.getY())) {
return false;
}
if (Double.doubleToLongBits(this.getZ()) != Double.doubleToLongBits(other.getZ())) {
return false;
}
if (Float.floatToIntBits(this.getPitch()) != Float.floatToIntBits(other.getPitch())) {
return false;
}
if (Float.floatToIntBits(this.getYaw()) != Float.floatToIntBits(other.getYaw())) {
return false;
}
if (other instanceof RespawnLocation otherRespawnLocation
&& this.respawnType != otherRespawnLocation.respawnType) {
if (!super.equals(obj)) {
return false;
}
return true;
return !(other instanceof RespawnLocation otherRespawnLocation)
|| this.respawnType == otherRespawnLocation.respawnType;
}

@Override
public int hashCode() {
int hash = 3;
hash = 19 * hash + String.valueOf(worldName).hashCode();
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.getX()));
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.getY()));
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.getZ()));
hash = 19 * hash + Float.floatToIntBits(this.getPitch());
hash = 19 * hash + Float.floatToIntBits(this.getYaw());
hash = 19 * hash + this.respawnType.hashCode();
return hash;
return 19 * super.hashCode() + this.respawnType.hashCode();
}

@Override
public String toString() {
return "RespawnLocation{" +
"world=" + worldName +
"world=" + getWorldName() +
",x=" + getX() +
",y=" + getY() +
",z=" + getZ() +
Expand Down