Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Some fixes, move blockconnection method to bukkit config

This commit is contained in:
KennyTV 2019-11-25 18:34:55 +01:00
parent 501adc503c
commit 21cad97f3f
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java
View File

@ -16,6 +16,7 @@ public class BukkitViaConfig extends AbstractViaConfig {
private boolean quickMoveActionFix;
private boolean hitboxFix1_9;
private boolean hitboxFix1_14;
private String blockConnectionMethod;
public BukkitViaConfig() {
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);
hitboxFix1_9 = getBoolean("change-1_9-hitbox", false);
hitboxFix1_14 = getBoolean("change-1_14-hitbox", false);
blockConnectionMethod = getString("blockconnection-method", "packet");
}
@Override
@ -60,6 +62,11 @@ public class BukkitViaConfig extends AbstractViaConfig {
return hitboxFix1_14;
}
@Override
public String getBlockConnectionMethod() {
return blockConnectionMethod;
}
@Override
public List<String> getUnsupportedOptions() {
return UNSUPPORTED;

5
bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java
View File

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

12
common/src/main/java/us/myles/ViaVersion/AbstractViaConfig.java
View File

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

5
velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java
View File

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