3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-27 08:30:09 +01:00

Filter new blocks/items in tag rewriting

Fixes ViaVersion/ViaBackwards#219
Dieser Commit ist enthalten in:
KennyTV 2020-07-01 09:40:18 +02:00
Ursprung b99b79f44a
Commit 96485c444e
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B

Datei anzeigen

@ -1,5 +1,7 @@
package us.myles.ViaVersion.api.rewriters;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.protocol.ClientboundPacketType;
import us.myles.ViaVersion.api.protocol.Protocol;
@ -79,12 +81,22 @@ public class TagRewriter {
for (int i = 0; i < tagsSize; i++) {
wrapper.passthrough(Type.STRING);
int[] ids = wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
int[] ids = wrapper.read(Type.VAR_INT_ARRAY_PRIMITIVE);
if (rewriteFunction != null) {
for (int j = 0; j < ids.length; j++) {
ids[j] = rewriteFunction.rewrite(ids[j]);
// Map ids and filter out new blocks
IntList idList = new IntArrayList(ids.length);
for (int id : ids) {
int mappedId = rewriteFunction.rewrite(id);
if (mappedId != -1) {
idList.add(mappedId);
}
}
wrapper.write(Type.VAR_INT_ARRAY_PRIMITIVE, idList.toArray(EMPTY_ARRAY));
} else {
// Write the original array
wrapper.write(Type.VAR_INT_ARRAY_PRIMITIVE, ids);
}
}
// Send new tags if present