2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2016-09-20 02:58:32 +02:00
|
|
|
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
|
2021-02-26 18:54:48 +01:00
|
|
|
index 64d7c9058ee757a6d3cf3b648596092a810e105c..4e2f243faa209925dcb7c3ef89df3ed875c5ff78 100644
|
2016-09-20 02:58:32 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
2021-02-26 18:54:48 +01:00
|
|
|
@@ -261,4 +261,11 @@ public class PaperConfig {
|
2016-09-20 02:58:32 +02:00
|
|
|
}
|
|
|
|
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
|
2021-02-26 18:54:48 +01:00
|
|
|
index 29aa35877549abaef40a88c23f4fc44622e31842..52d28a0ce408a58f0068920d2286409e5124b7f6 100644
|
2016-09-20 02:58:32 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2021-02-21 20:45:33 +01:00
|
|
|
@@ -160,7 +160,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
2020-06-25 14:04:34 +02:00
|
|
|
if (this.B && !this.player.isSleeping()) {
|
2016-09-20 02:58:32 +02:00
|
|
|
if (++this.C > 80) {
|
2018-07-16 22:08:09 +02:00
|
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getDisplayName().getString());
|
2020-06-25 14:04:34 +02:00
|
|
|
- this.disconnect(new ChatMessage("multiplayer.disconnect.flying"));
|
2016-09-20 02:58:32 +02:00
|
|
|
+ this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickPlayerMessage); // Paper - use configurable kick message
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
2021-02-21 20:45:33 +01:00
|
|
|
@@ -179,7 +179,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
2019-04-27 08:26:04 +02:00
|
|
|
if (this.D && this.player.getRootVehicle().getRidingPassenger() == this.player) {
|
2016-09-20 02:58:32 +02:00
|
|
|
if (++this.E > 80) {
|
2018-07-16 22:08:09 +02:00
|
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getDisplayName().getString());
|
2020-06-25 14:04:34 +02:00
|
|
|
- this.disconnect(new ChatMessage("multiplayer.disconnect.flying"));
|
2016-09-20 02:58:32 +02:00
|
|
|
+ this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickVehicleMessage); // Paper - use configurable kick message
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|