1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-25 00:07:36 +01:00

Added useExactLoginLocation(). Closes BUKKIT-145

useExactLoginLocation() looks for settings.use-exact-login-location within bukkit.yml.

If true, we will bypass Vanilla's behaviour of checking for collisions and moving the player if needed when they login.

If false, we will continue to follow Vanilla's behaviour and move players that 'collide' with objects when they login.
This commit is contained in:
EvilSeph 2012-01-29 06:36:43 -05:00
parent c5a4bfd291
commit f1a35effb0
3 changed files with 12 additions and 3 deletions
src/main
java
net/minecraft/server
org/bukkit/craftbukkit
resources/configurations

View file

@ -120,11 +120,15 @@ public class ServerConfigurationManager {
worldserver.chunkProviderServer.getChunkAt((int) entityplayer.locX >> 4, (int) entityplayer.locZ >> 4);
while (worldserver.a(entityplayer, entityplayer.boundingBox).size() != 0) {
entityplayer.setPosition(entityplayer.locX, entityplayer.locY + 1.0D, entityplayer.locZ);
// CraftBukkit start
if (!cserver.useExactLoginLocation()) {
while (worldserver.a(entityplayer, entityplayer.boundingBox).size() != 0) {
entityplayer.setPosition(entityplayer.locX, entityplayer.locY + 1.0D, entityplayer.locZ);
}
} else {
entityplayer.setPosition(entityplayer.locX, entityplayer.locY + entityplayer.getBukkitEntity().getEyeHeight(), entityplayer.locZ);
}
// CraftBukkit start
PlayerJoinEvent playerJoinEvent = new PlayerJoinEvent(this.cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.name + " joined the game.");
this.cserver.getPluginManager().callEvent(playerJoinEvent);

View file

@ -771,6 +771,10 @@ public final class CraftServer implements Server {
return this.console.allowFlight;
}
public boolean useExactLoginLocation() {
return configuration.getBoolean("settings.use-exact-login-location");
}
public ChunkGenerator getGenerator(String world) {
ConfigurationSection section = configuration.getConfigurationSection("worlds");
ChunkGenerator result = null;

View file

@ -20,6 +20,7 @@ settings:
permissions-file: permissions.yml
update-folder: update
ping-packet-limit: 100
use-exact-login-location: false
aliases:
icanhasbukkit:
- version