0fb8bdf0e0
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 14883d6b SPIGOT-6078: Add SmithItemEvent and expand SmithingInventory API CraftBukkit Changes: 115244c7 SPIGOT-6078: Add SmithItemEvent and expand SmithingInventory API
45 Zeilen
2.7 KiB
Diff
45 Zeilen
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 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 64d7c9058ee757a6d3cf3b648596092a810e105c..4e2f243faa209925dcb7c3ef89df3ed875c5ff78 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -261,4 +261,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/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
|
index 702b06fac36f51bdb53d530e0c01bfe1dd67c527..908d52f48b4bf2ddd638f2d718e1f6cb6148ce0a 100644
|
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
|
@@ -307,7 +307,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
if (this.B && !this.player.isSleeping()) {
|
|
if (++this.C > 80) {
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getDisplayName().getString());
|
|
- this.disconnect(new ChatMessage("multiplayer.disconnect.flying"));
|
|
+ this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickPlayerMessage); // Paper - use configurable kick message
|
|
return;
|
|
}
|
|
} else {
|
|
@@ -326,7 +326,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
if (this.D && this.player.getRootVehicle().getRidingPassenger() == 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"));
|
|
+ this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickVehicleMessage); // Paper - use configurable kick message
|
|
return;
|
|
}
|
|
} else {
|