Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-08 17:20:24 +01:00
Code Issues Releases Aktivität

Send impact_projectiles enttiy tag

Quellcode durchsuchen
Dieser Commit ist enthalten in:
KennyTV 2020-06-23 17:30:37 +02:00
Ursprung b0fe7d9c6d
Commit f391cc6185
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
2 geänderte Dateien mit 7 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java
Datei anzeigen

@ -17,7 +17,8 @@ public class TagRewriter {
private final IdRewriteFunction entityRewriter; private final IdRewriteFunction entityRewriter;
private final List<TagData> newBlockTags = new ArrayList<>(); private final List<TagData> newBlockTags = new ArrayList<>();
private final List<TagData> newItemTags = new ArrayList<>(); private final List<TagData> newItemTags = new ArrayList<>();
// add fluid or entity tag lists if needed at some point private final List<TagData> newEntityTags = new ArrayList<>();
// add fluid tag list if needed at some point
public TagRewriter(Protocol protocol, IdRewriteFunction blockRewriter, IdRewriteFunction itemRewriter, IdRewriteFunction entityRewriter) { public TagRewriter(Protocol protocol, IdRewriteFunction blockRewriter, IdRewriteFunction itemRewriter, IdRewriteFunction entityRewriter) {
this.protocol = protocol; this.protocol = protocol;
@ -51,7 +52,7 @@ public class TagRewriter {
handle(wrapper, blockRewriter, newBlockTags); handle(wrapper, blockRewriter, newBlockTags);
handle(wrapper, itemRewriter, newItemTags); handle(wrapper, itemRewriter, newItemTags);
if (entityRewriter == null) return; if (entityRewriter == null && newEntityTags.isEmpty()) return;
int fluidTagsSize = wrapper.passthrough(Type.VAR_INT); int fluidTagsSize = wrapper.passthrough(Type.VAR_INT);
for (int i = 0; i < fluidTagsSize; i++) { for (int i = 0; i < fluidTagsSize; i++) {
@ -59,7 +60,7 @@ public class TagRewriter {
wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE); wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
} }
handle(wrapper, entityRewriter, null); handle(wrapper, entityRewriter, newEntityTags);
}); });
} }
}); });
@ -95,6 +96,7 @@ public class TagRewriter {
case ITEM: case ITEM:
return newItemTags; return newItemTags;
case ENTITY: case ENTITY:
return newEntityTags;
case FLUID: case FLUID:
default: default:
return null; return null;

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
Datei anzeigen

@ -172,6 +172,8 @@ public class Protocol1_16To1_15_2 extends Protocol<ClientboundPackets1_15, Clien
tagRewriter.addTag(TagType.BLOCK, "minecraft:wooden_trapdoors", 193, 194, 195, 196, 197, 198); tagRewriter.addTag(TagType.BLOCK, "minecraft:wooden_trapdoors", 193, 194, 195, 196, 197, 198);
tagRewriter.addTag(TagType.ITEM, "minecraft:wooden_trapdoors", 215, 216, 217, 218, 219, 220); tagRewriter.addTag(TagType.ITEM, "minecraft:wooden_trapdoors", 215, 216, 217, 218, 219, 220);
tagRewriter.addTag(TagType.ITEM, "minecraft:beacon_payment_items", 529, 530, 531, 760); tagRewriter.addTag(TagType.ITEM, "minecraft:beacon_payment_items", 529, 530, 531, 760);
tagRewriter.addTag(TagType.ENTITY, "minecraft:impact_projectiles", 2, 72, 71, 37, 69, 79, 83, 15, 93);
// The client crashes if we don't send all tags it may use // The client crashes if we don't send all tags it may use
tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:guarded_by_piglins"); tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:guarded_by_piglins");
tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:soul_speed_blocks"); tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:soul_speed_blocks");