Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
47 Zeilen
2.5 KiB
Diff
47 Zeilen
2.5 KiB
Diff
From e98e5640f208339d4204374704bbd2e10a9495cb 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 b496bc3869..aa0e3c757d 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -248,4 +248,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 eec02ba0e9..969e28c3b2 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -144,6 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
if (++this.C > 80) {
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getDisplayName().getString());
|
|
this.disconnect(new ChatMessage("multiplayer.disconnect.flying", new Object[0]));
|
|
+ this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickPlayerMessage); // Paper - use configurable kick message
|
|
return;
|
|
}
|
|
} else {
|
|
@@ -162,7 +163,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
if (this.D && this.player.getRootVehicle().bO() == this.player) {
|
|
if (++this.E > 80) {
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getDisplayName().getString());
|
|
- this.disconnect(new ChatMessage("multiplayer.disconnect.flying", new Object[0]));
|
|
+ this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickVehicleMessage); // Paper - use configurable kick message
|
|
return;
|
|
}
|
|
} else {
|
|
--
|
|
2.18.0
|
|
|