3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-03 14:50:30 +01:00

Fix blaze remap and entity destroy in 1.15

Fixes #1542
Dieser Commit ist enthalten in:
KennyTV 2019-11-30 19:22:36 +01:00
Ursprung 18fa4062e6
Commit 2c95229cfc
3 geänderte Dateien mit 19 neuen und 2 gelöschten Zeilen

Datei anzeigen

@ -102,7 +102,7 @@ public class Entity1_15Types {
// Monsters // Monsters
ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE), ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE),
BLAZE(4, ABSTRACT_MONSTER), BLAZE(5, ABSTRACT_MONSTER),
CREEPER(12, ABSTRACT_MONSTER), CREEPER(12, ABSTRACT_MONSTER),
ENDERMITE(21, ABSTRACT_MONSTER), ENDERMITE(21, ABSTRACT_MONSTER),
ENDERMAN(20, ABSTRACT_MONSTER), ENDERMAN(20, ABSTRACT_MONSTER),

Datei anzeigen

@ -199,7 +199,7 @@ public class Protocol1_15To1_14_4 extends Protocol {
registerOutgoing(State.PLAY, 0x34, 0x35); registerOutgoing(State.PLAY, 0x34, 0x35);
registerOutgoing(State.PLAY, 0x35, 0x36); registerOutgoing(State.PLAY, 0x35, 0x36);
registerOutgoing(State.PLAY, 0x36, 0x37); registerOutgoing(State.PLAY, 0x36, 0x37);
registerOutgoing(State.PLAY, 0x37, 0x38);
registerOutgoing(State.PLAY, 0x38, 0x39); registerOutgoing(State.PLAY, 0x38, 0x39);
registerOutgoing(State.PLAY, 0x39, 0x3A); registerOutgoing(State.PLAY, 0x39, 0x3A);
registerOutgoing(State.PLAY, 0x3B, 0x3C); registerOutgoing(State.PLAY, 0x3B, 0x3C);

Datei anzeigen

@ -128,6 +128,23 @@ public class EntityPackets {
}); });
} }
}); });
// Destroy entities
protocol.registerOutgoing(State.PLAY, 0x37, 0x38, new PacketRemapper() {
@Override
public void registerMap() {
map(Type.VAR_INT_ARRAY);
handler(new PacketHandler() {
@Override
public void handle(PacketWrapper wrapper) throws Exception {
EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
for (int entity : wrapper.get(Type.VAR_INT_ARRAY, 0)) {
entityTracker.removeEntity(entity);
}
}
});
}
});
} }
public static int getNewEntityId(int oldId) { public static int getNewEntityId(int oldId) {