Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-04 17:49:48 +01:00
Code Issues Projects Releases Wiki Activity

Handle invalid entity equipment slots properly (#3540)

Browse Source
This commit is contained in:
RK_01 2023-12-03 18:34:14 +01:00 committed by GitHub
parent 0ac29fb2c2
commit 916c08ce7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java
View File

@ -36,11 +36,8 @@ import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRew
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
import com.viaversion.viaversion.util.Pair; import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.util.Triple; import com.viaversion.viaversion.util.Triple;
import java.util.ArrayList;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.UUID;
public class EntityPackets { public class EntityPackets {
public static final ValueTransformer<Byte, Short> toNewShort = new ValueTransformer<Byte, Short>(Type.SHORT) { public static final ValueTransformer<Byte, Short> toNewShort = new ValueTransformer<Byte, Short>(Type.SHORT) {
@ -153,6 +150,14 @@ public class EntityPackets {
public Integer transform(PacketWrapper wrapper, Short slot) throws Exception { public Integer transform(PacketWrapper wrapper, Short slot) throws Exception {
int entityId = wrapper.get(Type.VAR_INT, 0); int entityId = wrapper.get(Type.VAR_INT, 0);
int receiverId = wrapper.user().getEntityTracker(Protocol1_9To1_8.class).clientEntityId(); int receiverId = wrapper.user().getEntityTracker(Protocol1_9To1_8.class).clientEntityId();
// Cancel invalid slots as they would cause a packet read error in 1.9
// 1.8 handled invalid slots gracefully, but 1.9 does not
if (slot < 0 || slot > 4 || (entityId == receiverId && slot > 3)) {
wrapper.cancel();
return 0;
}
// Normally, 0 = hand and 1-4 = armor // 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 // ... 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) // (In 1.9+, every client treats the received the same: 0=hand, 1=offhand, 2-5=armor)