47 lines
2.5 KiB
Diff
47 lines
2.5 KiB
Diff
From 7ae8fc9dea13bbb435641999e91017797a427321 Mon Sep 17 00:00:00 2001
|
|
From: kashike <kashike@vq.lc>
|
|
Date: Tue, 20 Sep 2016 00:58:01 +0000
|
|
Subject: [PATCH] Configurable flying kick messages
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
index 211b88a..3161dad 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -234,4 +234,11 @@ public class PaperConfig {
|
|
}
|
|
packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
|
|
}
|
|
+
|
|
+ public static String flyingKickPlayerMessage = "Flying is not enabled on this server";
|
|
+ public static String flyingKickVehicleMessage = "Flying is not enabled on this server";
|
|
+ private static void flyingKickMessages() {
|
|
+ flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
|
|
+ flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index 6ed53dd..6c1efc6 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -142,7 +142,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
if (this.B) {
|
|
if (++this.C > 80) {
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", new Object[] { this.player.getName()});
|
|
- this.disconnect("Flying is not enabled on this server");
|
|
+ this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickPlayerMessage); // Paper - use configurable kick message
|
|
return;
|
|
}
|
|
} else {
|
|
@@ -161,7 +161,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
if (this.D && this.player.getVehicle().bw() == this.player) {
|
|
if (++this.E > 80) {
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", new Object[] { this.player.getName()});
|
|
- this.disconnect("Flying is not enabled on this server");
|
|
+ this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickVehicleMessage); // Paper - use configurable kick message
|
|
return;
|
|
}
|
|
} else {
|
|
--
|
|
2.10.2
|
|
|