mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-07-02 17:44:42 +02:00
37e61be6c2
Closes #289 Also dropped some patches which are useless. Changes in Purpur: Paper upstream updates Changes in Tuinity: Paper updated
45 lines
2.7 KiB
Diff
45 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: l_MrBoom_l <admin@epserv.ru>
|
|
Date: Wed, 30 Sep 2020 18:20:12 +0300
|
|
Subject: [PATCH] Configurable flight checks
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index b1b22d652f0bc4b6d2bff57438861677e2f12803..6a91434cccdc6ad7d7624a4dc39e125a030a173f 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -177,7 +177,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
++this.e;
|
|
this.processedMovePackets = this.receivedMovePackets;
|
|
if (this.B && !this.player.isSleeping()) {
|
|
- if (++this.C > 80) {
|
|
+ if (net.yatopia.server.YatopiaConfig.checkFlying && ++this.C > 80) { // Yatopia
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getDisplayName().getString());
|
|
this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickPlayerMessage); // Paper - use configurable kick message
|
|
return;
|
|
@@ -196,7 +196,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
this.w = this.r.locY();
|
|
this.x = this.r.locZ();
|
|
if (this.D && this.player.getRootVehicle().getRidingPassenger() == this.player) {
|
|
- if (++this.E > 80) {
|
|
+ if (net.yatopia.server.YatopiaConfig.checkVehicleFlying && ++this.E > 80) { // Yatopia
|
|
PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getDisplayName().getString());
|
|
this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickVehicleMessage); // Paper - use configurable kick message
|
|
return;
|
|
diff --git a/src/main/java/net/yatopia/server/YatopiaConfig.java b/src/main/java/net/yatopia/server/YatopiaConfig.java
|
|
index e4c5a485caa9e97388aefd9dc5a3ce40efeca738..f0e7684304cab9cea05fa266a66a2ad8172c55b6 100644
|
|
--- a/src/main/java/net/yatopia/server/YatopiaConfig.java
|
|
+++ b/src/main/java/net/yatopia/server/YatopiaConfig.java
|
|
@@ -246,4 +246,11 @@ public class YatopiaConfig {
|
|
public static boolean isProxy() {
|
|
return org.spigotmc.SpigotConfig.bungee || com.destroystokyo.paper.PaperConfig.velocitySupport;
|
|
}
|
|
+
|
|
+ public static boolean checkFlying = true;
|
|
+ public static boolean checkVehicleFlying = true;
|
|
+ private static void flightChecks() {
|
|
+ checkFlying = getBoolean("settings.checks.flight", checkFlying);
|
|
+ checkVehicleFlying = getBoolean("settings.checks.vehicle-flight", checkVehicleFlying);
|
|
+ }
|
|
}
|