Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-12-23 08:57:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix disconnecting error for unknown mobs with metadata (#3443)

Browse Source
This commit is contained in:
Unoqwy 2023-10-03 11:46:02 +02:00 committed by GitHub
parent 429e4f0bff
commit 11cb113619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,11 +104,10 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
public void handleMetadata(final int entityId, final List<Metadata> metadataList, final UserConnection connection) {
final TrackedEntity entity = tracker(connection).entity(entityId);
final EntityType type = entity != null ? entity.entityType() : null;
int i = 0; // Count index for fast removal
for (final Metadata metadata : metadataList.toArray(EMPTY_ARRAY)) { // Copy the list to allow mutation
// Call handlers implementing the old handleMetadata
if (!callOldMetaHandler(entityId, type, metadata, metadataList, connection)) {
metadataList.remove(i--);
metadataList.remove(metadata);
continue;
}
@ -126,22 +125,22 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
filter.handler().handle(event, metadata);
} catch (final Exception e) {
logException(e, type, metadataList, metadata);
metadataList.remove(i--);
metadataList.remove(metadata);
break;
}
if (event.cancelled()) {
// Remove meta, decrease list index counter, and break current filter loop
metadataList.remove(i--);
// Remove meta, and break current filter loop
metadataList.remove(metadata);
break;
}
}
if (event != null && event.extraMeta() != null) {
final List<Metadata> extraMeta = event != null ? event.extraMeta() : null;
if (extraMeta != null) {
// Finally, add newly created meta
metadataList.addAll(event.extraMeta());
metadataList.addAll(extraMeta);
}
i++;
}
if (entity != null) {