Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-02-16 19:51:35 +01:00
Code Issues Projects Releases Wiki Activity

Don't track entities with invalid entity type

Browse Source 
Legacy versions (<=1.12.2) are skipping entities with invalid types silently.
This commit is contained in:
FlorianMichael 2024-07-04 20:11:39 +02:00
parent 7fef96d77e
commit 1cc3bddc26
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/SpawnPacketRewriter1_9.java
View File

@ -18,6 +18,7 @@
package com.viaversion.viaversion.protocols.v1_8to1_9.rewriter; package com.viaversion.viaversion.protocols.v1_8to1_9.rewriter;
import com.viaversion.viaversion.api.data.entity.EntityTracker; import com.viaversion.viaversion.api.data.entity.EntityTracker;
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_9; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_9;
import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.item.DataItem;
@ -63,7 +64,10 @@ public class SpawnPacketRewriter1_9 {
int entityID = wrapper.get(Types.VAR_INT, 0); int entityID = wrapper.get(Types.VAR_INT, 0);
int typeID = wrapper.get(Types.BYTE, 0); int typeID = wrapper.get(Types.BYTE, 0);
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class);
tracker.addEntity(entityID, EntityTypes1_9.getTypeFromId(typeID, true)); EntityType entityType = EntityTypes1_9.getTypeFromId(typeID, true);
if (entityType != null) {
tracker.addEntity(entityID, entityType);
}
}); });
map(Types.INT, toNewDouble); // 3 - X - Needs to be divided by 32 map(Types.INT, toNewDouble); // 3 - X - Needs to be divided by 32
@ -176,7 +180,10 @@ public class SpawnPacketRewriter1_9 {
int entityID = wrapper.get(Types.VAR_INT, 0); int entityID = wrapper.get(Types.VAR_INT, 0);
int typeID = wrapper.get(Types.UNSIGNED_BYTE, 0); int typeID = wrapper.get(Types.UNSIGNED_BYTE, 0);
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class);
tracker.addEntity(entityID, EntityTypes1_9.getTypeFromId(typeID, false)); EntityType type = EntityTypes1_9.getTypeFromId(typeID, false);
if (type != null) {
tracker.addEntity(entityID, type);
}
}); });
map(Types.INT, toNewDouble); // 3 - X - Needs to be divided by 32 map(Types.INT, toNewDouble); // 3 - X - Needs to be divided by 32

3
common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
View File

@ -589,6 +589,9 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
byte type = wrapper.get(Types.BYTE, 0); byte type = wrapper.get(Types.BYTE, 0);
EntityType entType = objectTypeFromId(type); EntityType entType = objectTypeFromId(type);
if (entType == null) {
return;
}
// Register Type ID // Register Type ID
tracker(wrapper.user()).addEntity(entityId, entType); tracker(wrapper.user()).addEntity(entityId, entType);
}; };