Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-07-01 09:04:56 +02:00
Code Issues Projects Releases Wiki Activity

Fix 1.14+ walk animation (#1469)

Browse Source 
* Do not send NaN health metadata to 1.14+ clients
* Added config option 'fix-1_14-health-nan'
This commit is contained in:
Lukas 2019-10-01 10:04:58 +02:00 committed by Myles
parent aa9a1df1ab
commit 7e008226ec
7 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,4 +274,9 @@ public class BukkitViaConfig extends Config implements ViaVersionConfig {
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
}

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

@ -327,4 +327,9 @@ public class BungeeViaConfig extends Config implements ViaVersionConfig {
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
}

2
common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java
View File

@ -344,4 +344,6 @@ public interface ViaVersionConfig {
* @return True if enabled
*/
boolean isNonFullBlockLightFix();
boolean is1_14HealthNaNFix();
}

6
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/MetadataRewriter.java
View File

@ -39,6 +39,12 @@ public class MetadataRewriter {
if (metadata.getId() > 5) {
metadata.setId(metadata.getId() + 1);
}
if (metadata.getId() == 8 && type.isOrHasParent(Entity1_14Types.EntityType.LIVINGENTITY)) {
final float v = ((Number) metadata.getValue()).floatValue();
if (Float.isNaN(v) && Via.getConfig().is1_14HealthNaNFix()) {
metadata.setValue(1F);
}
}
//Metadata 12 added to living_entity
if (metadata.getId() > 11 && type.isOrHasParent(Entity1_14Types.EntityType.LIVINGENTITY)) {

2
common/src/main/resources/assets/viaversion/config.yml
View File

@ -128,6 +128,8 @@ change-1_9-hitbox: false
change-1_14-hitbox: false
# Fixes 1.14+ clients on sub 1.14 servers having a light value of 0 for non full blocks.
fix-non-full-blocklight: true
# Fixes walk animation not shown when health is set to Float.NaN
fix-1_14-health-nan: true
#
# Enable serverside block-connections for 1.13+ clients
serverside-blockconnections: false

5
sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java
View File

@ -280,4 +280,9 @@ public class SpongeViaConfig extends Config implements ViaVersionConfig {
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
}

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

@ -333,4 +333,9 @@ public class VelocityViaConfig extends Config implements ViaVersionConfig {
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
}