Skip to content

Commit 2a09764

Browse files
committed
fix: #92
1 parent 7e8ef8c commit 2a09764

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

common/src/main/java/dev/tonimatas/packetfixer/mixins/MinecraftServerMixin.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ public class MinecraftServerMixin {
1414

1515
@Redirect(method = "playerIdleTimeout", at = @At(value = "FIELD", target = "Lnet/minecraft/server/MinecraftServer;playerIdleTimeout:I"))
1616
private int packetfixer$playerIdleTimeout(MinecraftServer server) {
17-
return Math.max(playerIdleTimeout, Config.getTimeout());
17+
if (playerIdleTimeout <= 0) {
18+
return 0;
19+
} else {
20+
return Math.max(playerIdleTimeout, Config.getPlayerIdleTimeout());
21+
}
1822
}
1923
}

common/src/main/java/dev/tonimatas/packetfixer/util/Config.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public class Config {
1515
private static int varLong = 10;
1616
private static int stringSize = 32767;
1717
private static int chunkPacketData = 2097152;
18-
private static int timeout = 120;
1918
private static int readTimeout = 120;
2019
private static int loginTimeout = 120;
2120
private static int keepAliveTimeout = 120;
21+
private static int playerIdleTimeout = 0;
2222
private static boolean forceUnlimitedNbtEnabled = false;
2323

2424
@SuppressWarnings("ResultOfMethodCallIgnored")
@@ -48,10 +48,10 @@ public static void runProperties() {
4848
varLong = Integer.parseInt(checkVariable(properties, "varLong", Integer.toString(varLong)));
4949
stringSize = Integer.parseInt(checkVariable(properties, "stringSize", Integer.toString(stringSize)));
5050
chunkPacketData = Integer.parseInt(checkVariable(properties, "chunkPacketData", Integer.toString(chunkPacketData)));
51-
timeout = Integer.parseInt(checkVariable(properties, "timeout", Integer.toString(timeout)));
5251
readTimeout = Integer.parseInt(checkVariable(properties, "readTimeout", Integer.toString(readTimeout)));
5352
loginTimeout = Integer.parseInt(checkVariable(properties, "loginTimeout", Integer.toString(loginTimeout)));
5453
keepAliveTimeout = Integer.parseInt(checkVariable(properties, "keepAliveTimeout", Integer.toString(keepAliveTimeout)));
54+
playerIdleTimeout = Integer.parseInt(checkVariable(properties, "playerIdleTimeout", Integer.toString(playerIdleTimeout)));
5555
forceUnlimitedNbtEnabled = Boolean.parseBoolean(checkVariable(properties, "forceUnlimitedNbtEnabled", Boolean.toString(forceUnlimitedNbtEnabled)));
5656
save(properties, propertiesFile);
5757
} catch (IOException e) {
@@ -90,10 +90,6 @@ public static int getStringSize() {
9090
public static int getChunkPacketData() {
9191
return allSizesUnlimited ? Integer.MAX_VALUE : chunkPacketData;
9292
}
93-
94-
public static int getTimeout() {
95-
return timeout;
96-
}
9793

9894
public static int getReadTimeout() {
9995
return readTimeout;
@@ -107,6 +103,10 @@ public static int getKeepAliveTimeout() {
107103
return keepAliveTimeout;
108104
}
109105

106+
public static int getPlayerIdleTimeout() {
107+
return playerIdleTimeout;
108+
}
109+
110110
public static boolean isForceUnlimitedNbtEnabled() {
111111
return forceUnlimitedNbtEnabled;
112112
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx5G
33
org.gradle.daemon=false
44

55
# Project
6-
modVersion=3.3.3
6+
modVersion=3.3.4
77
javaVersion=21
88

99
# Common

0 commit comments

Comments
 (0)