wip: update to the new event generator

SpongePowered · Sep 30, 2024 · 49ac418 · 49ac418
1 parent 70e5d9a
commit 49ac418
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -19,6 +19,8 @@
          <trust group="org.codehaus.groovy" name="groovy-templates" reason="FIX"/>
          <trust group="org.codehaus.groovy" name="groovy-test" reason="FIX"/>
          <trust group="org.codehaus.groovy" name="groovy-xml" reason="FIX"/>
+         <trust group="org.spongepowered" name="event-impl-gen" reason="SNAPSHOT"/>
+         <trust group="org.spongepowered" name="event-impl-gen-annotations" reason="SNAPSHOT"/>
          <trust group="org.spongepowered" name="vanillagradle" reason="FIX THIS"/>
          <trust group="org.spongepowered" name="vanillagradle-downloader-apache-http" reason="FIX THIS"/>
          <trust group="org.spongepowered" name="vanillagradle-resolver-core" reason="FIX THIS"/>
@@ -583,6 +585,11 @@
             <sha256 value="8acb1f3b72a6f026916ac0735bad9aab0293d527edb7b365327def13a9367b7a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.code.gson" name="gson-parent" version="2.11.0">
+         <artifact name="gson-parent-2.11.0.pom">
+            <sha256 value="8acb1f3b72a6f026916ac0735bad9aab0293d527edb7b365327def13a9367b7a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.code.gson" name="gson-parent" version="2.8.0">
          <artifact name="gson-parent-2.8.0.pom">
             <sha256 value="0f1d8369b1e9f1bc4b467c8dcfdd8b59733aad5b5c8419c3a59b2f9abaf04cd2" origin="Generated by Gradle"/>
@@ -603,6 +610,14 @@
             <sha256 value="893d56afcea1b22f83220fd7e49a6668c5b8901e39bd59dc57b42f55673721ce" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.dagger" name="dagger" version="2.42">
+         <artifact name="dagger-2.42.jar">
+            <sha256 value="7ad8147fdb5dfb481b7cde8c70da73afbaa21430ce757fcd96709fcfb6a4d56b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="dagger-2.42.pom">
+            <sha256 value="ca6529bd6d79090f0ab6f5da452eb4fbb29377b48e6a806e7612396dcb2998e0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotation" version="2.24.1">
          <artifact name="error_prone_annotation-2.24.1.jar">
             <sha256 value="dc202da451680aa8cdda7c68d959f27c112dca8f8fdeaf7c597de73cb2b1a0a6" origin="Generated by Gradle"/>

diff --git a/...ongepowered/common/event/tracking/context/transaction/inventory/CompositeTransaction.java b/...ongepowered/common/event/tracking/context/transaction/inventory/CompositeTransaction.java
@@ -59,9 +59,8 @@ public void pushCause(CauseStackManager.StackFrame frame, E e) {
     public boolean markCancelledTransactions(
         final E event,
         final ImmutableList<? extends GameTransaction<E>> gameTransactions) {
-        event.children().stream().filter(e -> e instanceof Cancellable)
-            .map(e -> (Cancellable) e)
-            .forEach(e -> e.setCancelled(event.isCancelled()));
+        event.setCancelled(true);
+        gameTransactions.forEach(GameTransaction::markCancelled);
         return false;
     }