Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-25 03:55:27 +01:00
Code Issues Projects Releases Wiki Activity

fix: Properly handle spawn radius

Browse Source
This commit is contained in:
Ben Woo 2023-02-02 14:19:07 +08:00
parent 20ce469aec
commit 7f5f11152a
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
View File

@ -16,6 +16,7 @@ import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
import com.onarandombox.MultiverseCore.utils.CompatibilityLayer; import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
import com.onarandombox.MultiverseCore.utils.PermissionTools; import com.onarandombox.MultiverseCore.utils.PermissionTools;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.GameRule;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
@ -32,6 +33,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
/** /**
@ -96,6 +98,9 @@ public class MVPlayerListener implements Listener {
} }
// World has been set to the appropriate world // World has been set to the appropriate world
Location respawnLocation = getMostAccurateRespawnLocation(world); Location respawnLocation = getMostAccurateRespawnLocation(world);
respawnLocation = adjustForSpawnRadius(world, respawnLocation);
Logging.fine("Spawning %s at %s", event.getPlayer().getName(), respawnLocation.toString());
MVRespawnEvent respawnEvent = new MVRespawnEvent(respawnLocation, event.getPlayer(), "compatability"); MVRespawnEvent respawnEvent = new MVRespawnEvent(respawnLocation, event.getPlayer(), "compatability");
this.plugin.getServer().getPluginManager().callEvent(respawnEvent); this.plugin.getServer().getPluginManager().callEvent(respawnEvent);
@ -110,6 +115,26 @@ public class MVPlayerListener implements Listener {
return w.getSpawnLocation(); return w.getSpawnLocation();
} }
private Location adjustForSpawnRadius(World world, Location location) {
Location respawnLocation = location.clone();
int spawnRadius = Optional.ofNullable(world.getGameRuleValue(GameRule.SPAWN_RADIUS)).orElse(1);
if (spawnRadius > 1) {
// Math formula from https://stackoverflow.com/a/5838055
double t = 2 * Math.PI * Math.random();
double u = (Math.random() + Math.random()) * spawnRadius;
double r = u > spawnRadius ? (2 * spawnRadius) - u : u;
double x = r * Math.cos(t);
double z = r * Math.sin(t);
Logging.fine("Adjust spawn radius with offset: %f, %f", x, z);
respawnLocation.add(x, 0, z);
}
return Optional.ofNullable(this.plugin.getSafeTTeleporter().getSafeLocation(respawnLocation, 48, 16))
.orElse(respawnLocation);
}
/** /**
* This method is called when a player joins the server. * This method is called when a player joins the server.
* @param event The Event that was fired. * @param event The Event that was fired.