3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-10-08 11:10:06 +02:00

Some fixes, move blockconnection method to bukkit config

Dieser Commit ist enthalten in:
KennyTV 2019-11-25 18:34:55 +01:00
Ursprung 501adc503c
Commit 21cad97f3f
4 geänderte Dateien mit 12 neuen und 17 gelöschten Zeilen

Datei anzeigen

@ -16,6 +16,7 @@ public class BukkitViaConfig extends AbstractViaConfig {
private boolean quickMoveActionFix; private boolean quickMoveActionFix;
private boolean hitboxFix1_9; private boolean hitboxFix1_9;
private boolean hitboxFix1_14; private boolean hitboxFix1_14;
private String blockConnectionMethod;
public BukkitViaConfig() { public BukkitViaConfig() {
super(new File(((Plugin) Via.getPlatform()).getDataFolder(), "config.yml")); super(new File(((Plugin) Via.getPlatform()).getDataFolder(), "config.yml"));
@ -29,6 +30,7 @@ public class BukkitViaConfig extends AbstractViaConfig {
quickMoveActionFix = getBoolean("quick-move-action-fix", false); quickMoveActionFix = getBoolean("quick-move-action-fix", false);
hitboxFix1_9 = getBoolean("change-1_9-hitbox", false); hitboxFix1_9 = getBoolean("change-1_9-hitbox", false);
hitboxFix1_14 = getBoolean("change-1_14-hitbox", false); hitboxFix1_14 = getBoolean("change-1_14-hitbox", false);
blockConnectionMethod = getString("blockconnection-method", "packet");
} }
@Override @Override
@ -60,6 +62,11 @@ public class BukkitViaConfig extends AbstractViaConfig {
return hitboxFix1_14; return hitboxFix1_14;
} }
@Override
public String getBlockConnectionMethod() {
return blockConnectionMethod;
}
@Override @Override
public List<String> getUnsupportedOptions() { public List<String> getUnsupportedOptions() {
return UNSUPPORTED; return UNSUPPORTED;

Datei anzeigen

@ -79,11 +79,6 @@ public class BungeeViaConfig extends AbstractViaConfig {
return false; return false;
} }
@Override
public String getBlockConnectionMethod() {
return "packet";
}
/** /**
* What is the interval for checking servers via ping * What is the interval for checking servers via ping
* -1 for disabled * -1 for disabled

Datei anzeigen

@ -43,7 +43,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
private boolean minimizeCooldown; private boolean minimizeCooldown;
private boolean teamColourFix; private boolean teamColourFix;
private boolean serversideBlockConnections; private boolean serversideBlockConnections;
private String blockConnectionMethod;
private boolean reduceBlockStorageMemory; private boolean reduceBlockStorageMemory;
private boolean flowerStemWhenBlockAbove; private boolean flowerStemWhenBlockAbove;
private boolean snowCollisionFix; private boolean snowCollisionFix;
@ -94,12 +93,11 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
blockedProtocols = new HashSet<>(getIntegerList("block-protocols")); blockedProtocols = new HashSet<>(getIntegerList("block-protocols"));
blockedDisconnectMessage = getString("block-disconnect-msg", "You are using an unsupported Minecraft version!"); blockedDisconnectMessage = getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
reloadDisconnectMessage = getString("reload-disconnect-msg", "Server reload, please rejoin!"); reloadDisconnectMessage = getString("reload-disconnect-msg", "Server reload, please rejoin!");
suppress1_13ConversionErrors = getBoolean("minimize-cooldown", true); minimizeCooldown = getBoolean("minimize-cooldown", true);
disable1_13TabComplete = getBoolean("team-colour-fix", true); teamColourFix = getBoolean("team-colour-fix", true);
minimizeCooldown = getBoolean("suppress-1_13-conversion-errors", false); suppress1_13ConversionErrors = getBoolean("suppress-1_13-conversion-errors", false);
teamColourFix = getBoolean("disable-1_13-auto-complete", false); disable1_13TabComplete = getBoolean("disable-1_13-auto-complete", false);
serversideBlockConnections = getBoolean("serverside-blockconnections", false); serversideBlockConnections = getBoolean("serverside-blockconnections", false);
blockConnectionMethod = getString("blockconnection-method", "packet");
reduceBlockStorageMemory = getBoolean("reduce-blockstorage-memory", false); reduceBlockStorageMemory = getBoolean("reduce-blockstorage-memory", false);
flowerStemWhenBlockAbove = getBoolean("flowerstem-when-block-above", false); flowerStemWhenBlockAbove = getBoolean("flowerstem-when-block-above", false);
snowCollisionFix = getBoolean("fix-low-snow-collision", false); snowCollisionFix = getBoolean("fix-low-snow-collision", false);
@ -294,7 +292,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
@Override @Override
public String getBlockConnectionMethod() { public String getBlockConnectionMethod() {
return blockConnectionMethod; return "packet";
} }
@Override @Override

Datei anzeigen

@ -84,11 +84,6 @@ public class VelocityViaConfig extends AbstractViaConfig {
return false; return false;
} }
@Override
public String getBlockConnectionMethod() {
return "packet";
}
/** /**
* What is the interval for checking servers via ping * What is the interval for checking servers via ping
* -1 for disabled * -1 for disabled