65 lines
4.5 KiB
Diff
65 lines
4.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gabriele C <sgdc3.mail@gmail.com>
|
||
|
|
Date: Mon, 22 Oct 2018 17:34:10 +0200
|
||
|
|
Subject: [PATCH] Add option to prevent players from moving into unloaded
|
||
|
|
chunks #1551
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index f280dbff4a09bc611a9ca565c6d697d08801f53b..fbf3ccfb347a5ba6e895339e9576629d940d1aa4 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -396,4 +396,9 @@ public class PaperWorldConfig {
|
||
|
|
waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
|
||
|
|
log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public boolean preventMovingIntoUnloadedChunks = false;
|
||
|
|
+ private void preventMovingIntoUnloadedChunks() {
|
||
|
|
+ preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
index 4fd8d775790c037e82f9b0d29ed0eccf03c2dc66..b5593300516fad767f603084aca4abcda4424db3 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -541,6 +541,13 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
|
||
|
|
}
|
||
|
|
speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
|
||
|
|
|
||
|
|
+ // Paper start - Prevent moving into unloaded chunks
|
||
|
|
+ if (player.level.paperConfig.preventMovingIntoUnloadedChunks && worldserver.getChunkIfLoadedImmediately((int) Math.floor(packet.getX()) >> 4, (int) Math.floor(packet.getZ()) >> 4) == null) {
|
||
|
|
+ this.connection.send(new ClientboundMoveVehiclePacket(entity));
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
if (d10 - d9 > Math.max(100.0D, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) {
|
||
|
|
// CraftBukkit end
|
||
|
|
ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getName().getString(), this.player.getName().getString(), d6, d7, d8);
|
||
|
|
@@ -1139,9 +1146,9 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
|
||
|
|
double d1 = this.player.getY();
|
||
|
|
double d2 = this.player.getZ();
|
||
|
|
double d3 = this.player.getY();
|
||
|
|
- double d4 = packet.getX(this.player.getX());
|
||
|
|
+ double d4 = packet.getX(this.player.getX());double toX = d4; // Paper - OBFHELPER
|
||
|
|
double d5 = packet.getY(this.player.getY());
|
||
|
|
- double d6 = packet.getZ(this.player.getZ());
|
||
|
|
+ double d6 = packet.getZ(this.player.getZ());double toZ = d6; // Paper - OBFHELPER
|
||
|
|
float f = packet.getYRot(this.player.yRot);
|
||
|
|
float f1 = packet.getXRot(this.player.xRot);
|
||
|
|
double d7 = d4 - this.firstGoodX;
|
||
|
|
@@ -1180,6 +1187,12 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
|
||
|
|
} else {
|
||
|
|
speed = player.abilities.walkingSpeed * 10f;
|
||
|
|
}
|
||
|
|
+ // Paper start - Prevent moving into unloaded chunks
|
||
|
|
+ if (player.level.paperConfig.preventMovingIntoUnloadedChunks && (this.player.getX() != toX || this.player.getZ() != toZ) && !worldserver.hasChunk((int) Math.floor(toX) >> 4, (int) Math.floor(toZ) >> 4)) {
|
||
|
|
+ this.internalTeleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.yRot, this.player.xRot, Collections.emptySet());
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
if (!this.player.isChangingDimension() && (!this.player.getLevel().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
|
||
|
|
float f2 = this.player.isFallFlying() ? 300.0F : 100.0F;
|