Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-26 20:16:02 +01:00
Code Issues Projects Releases Wiki Activity

Finish merge

Browse Source
This commit is contained in:
KennyTV 2019-10-02 09:37:18 +02:00
parent bbeabd20b8
commit 7ba2630dd2
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,11 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
return getBoolean("fix-non-full-blocklight", false);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
@Override
public boolean is1_15InstantRespawn() {
return getBoolean("use-1_15-instant-respawn", false);

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
View File

@ -141,7 +141,7 @@ public class EntityPackets {
@Override
public Integer transform(PacketWrapper wrapper, Short slot) throws Exception {
int entityId = wrapper.get(Type.VAR_INT, 0);
int receiverId = wrapper.user().get(EntityTracker.class).getEntityID();
int receiverId = wrapper.user().get(EntityTracker1_9.class).getClientEntityId();
// Normally, 0 = hand and 1-4 = armor
// ... but if the sent id is equal to the receiver's id, 0-3 will instead mark the armor slots
// (In 1.9+, every client treats the received the same: 0=hand, 1=offhand, 2-5=armor)

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

@ -130,8 +130,6 @@ change-1_14-hitbox: false
fix-non-full-blocklight: true
# Fixes walk animation not shown when health is set to Float.NaN
fix-1_14-health-nan: true
# Fixes 1.14+ clients on sub 1.14 servers having a light value of 0 for non full blocks.
fix-non-full-blocklight: true
# Should 1.15+ clients respawn instantly / without showing a death screen?
use-1_15-instant-respawn: false
#

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

@ -59,14 +59,4 @@ public class SpongeViaConfig extends AbstractViaConfig {
public boolean is1_14HitboxFix() {
return false;
}
@Override
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
}