fix group add and remove operations for compiletime, fixes #1006

wurstscript · Jul 1, 2021 · 7e79146 · 7e79146
1 parent edc2627
commit 7e79146
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...q.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/GroupProvider.java b/...q.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/GroupProvider.java
@@ -24,14 +24,19 @@ public void GroupClear(IlConstHandle group) {
         ((LinkedHashSet<IlConstHandle>) group.getObj()).clear();
     }
 
-    public void GroupAddUnit(IlConstHandle group, IlConstHandle unit) {
+    public ILconstBool GroupAddUnit(IlConstHandle group, IlConstHandle unit) {
         LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
         groupList.add(unit);
+        return ILconstBool.TRUE;
     }
 
-    public void GroupRemoveUnit(IlConstHandle group, IlConstHandle unit) {
+    public ILconstBool GroupRemoveUnit(IlConstHandle group, IlConstHandle unit) {
         LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
-        groupList.remove(unit);
+        if (groupList.contains(unit)) {
+            groupList.remove(unit);
+            return ILconstBool.TRUE;
+        }
+        return ILconstBool.FALSE;
     }
 
     public ILconst FirstOfGroup(IlConstHandle group) {
@@ -75,7 +80,7 @@ public ILconstInt BlzGroupGetSize(IlConstHandle group) {
         LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
         return ILconstInt.create(groupList.size());
     }
-	
+
     public ILconst BlzGroupUnitAt(IlConstHandle group, ILconstInt index) {
         LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
         ILconst elem = ILconstNull.instance();
@@ -90,7 +95,7 @@ else if(index.getVal() == 0)
             return FirstOfGroup(group);
         return elem;
     }
-    
+
     public ILconstInt BlzGroupAddGroupFast(IlConstHandle group, IlConstHandle groupAdd) {
         LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) groupAdd.getObj();
         groupList.addAll((LinkedHashSet<IlConstHandle>) group.getObj());
@@ -101,5 +106,5 @@ public ILconstInt BlzGroupRemoveGroupFast(IlConstHandle group, IlConstHandle gro
         LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) groupRm.getObj();
         groupList.removeAll((LinkedHashSet<IlConstHandle>) group.getObj());
         return ILconstInt.create(groupList.size());
-    }	
+    }
 }