Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-24 20:42:39 +02:00
Code Issues Projects Releases Wiki Activity

Fix node child removal

Browse Source
This commit is contained in:
TheMode 2021-08-23 18:43:20 +02:00
parent dc59f3fd23
commit 7740c45982
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/event/EventNodeImpl.java
View File

@ -127,7 +127,7 @@ class EventNodeImpl<T extends Event> implements EventNode<T> {
Check.stateCondition(Objects.equals(parent, child), "Cannot have a child as parent"); Check.stateCondition(Objects.equals(parent, child), "Cannot have a child as parent");
if (!children.add((EventNodeImpl<T>) childImpl)) return this; // Couldn't add the child (already present?) if (!children.add((EventNodeImpl<T>) childImpl)) return this; // Couldn't add the child (already present?)
childImpl.parent = this; childImpl.parent = this;
childImpl.propagateEvents(this); // Propagate after setting the parent childImpl.propagateEvents(this);
} }
return this; return this;
} }
@ -138,8 +138,8 @@ class EventNodeImpl<T extends Event> implements EventNode<T> {
final var childImpl = (EventNodeImpl<? extends T>) child; final var childImpl = (EventNodeImpl<? extends T>) child;
final boolean result = this.children.remove(childImpl); final boolean result = this.children.remove(childImpl);
if (!result) return this; // Child not found if (!result) return this; // Child not found
childImpl.propagateEvents(parent); // Propagate before removing the parent
childImpl.parent = null; childImpl.parent = null;
childImpl.propagateEvents(this);
} }
return this; return this;
} }
@ -173,10 +173,10 @@ class EventNodeImpl<T extends Event> implements EventNode<T> {
final var nodeImpl = (EventNodeImpl<? extends T>) node; final var nodeImpl = (EventNodeImpl<? extends T>) node;
Check.stateCondition(nodeImpl.parent != null, "Node already has a parent"); Check.stateCondition(nodeImpl.parent != null, "Node already has a parent");
Check.stateCondition(Objects.equals(parent, nodeImpl), "Cannot map to self"); Check.stateCondition(Objects.equals(parent, nodeImpl), "Cannot map to self");
var previous = this.mappedNodeCache.put(value, (EventNodeImpl<T>) nodeImpl); EventNodeImpl<T> previous = this.mappedNodeCache.put(value, (EventNodeImpl<T>) nodeImpl);
if (previous != null) previous.parent = null; if (previous != null) previous.parent = null;
nodeImpl.parent = this; nodeImpl.parent = this;
nodeImpl.propagateEvents(this); // Propagate after setting the parent nodeImpl.propagateEvents(this);
} }
} }
@ -186,8 +186,8 @@ class EventNodeImpl<T extends Event> implements EventNode<T> {
final var mappedNode = this.mappedNodeCache.remove(value); final var mappedNode = this.mappedNodeCache.remove(value);
if (mappedNode == null) return false; // Mapped node not found if (mappedNode == null) return false; // Mapped node not found
final var childImpl = (EventNodeImpl<? extends T>) mappedNode; final var childImpl = (EventNodeImpl<? extends T>) mappedNode;
childImpl.propagateEvents(parent); // Propagate before removing the parent
childImpl.parent = null; childImpl.parent = null;
childImpl.propagateEvents(this);
return true; return true;
} }
} }