Skip to content

Commit 7e79146

Browse files
committed
fix group add and remove operations for compiletime, fixes #1006
1 parent edc2627 commit 7e79146

File tree

1 file changed

+11
-6
lines changed
  • de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers

1 file changed

+11
-6
lines changed

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/GroupProvider.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,19 @@ public void GroupClear(IlConstHandle group) {
2424
((LinkedHashSet<IlConstHandle>) group.getObj()).clear();
2525
}
2626

27-
public void GroupAddUnit(IlConstHandle group, IlConstHandle unit) {
27+
public ILconstBool GroupAddUnit(IlConstHandle group, IlConstHandle unit) {
2828
LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
2929
groupList.add(unit);
30+
return ILconstBool.TRUE;
3031
}
3132

32-
public void GroupRemoveUnit(IlConstHandle group, IlConstHandle unit) {
33+
public ILconstBool GroupRemoveUnit(IlConstHandle group, IlConstHandle unit) {
3334
LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
34-
groupList.remove(unit);
35+
if (groupList.contains(unit)) {
36+
groupList.remove(unit);
37+
return ILconstBool.TRUE;
38+
}
39+
return ILconstBool.FALSE;
3540
}
3641

3742
public ILconst FirstOfGroup(IlConstHandle group) {
@@ -75,7 +80,7 @@ public ILconstInt BlzGroupGetSize(IlConstHandle group) {
7580
LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
7681
return ILconstInt.create(groupList.size());
7782
}
78-
83+
7984
public ILconst BlzGroupUnitAt(IlConstHandle group, ILconstInt index) {
8085
LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
8186
ILconst elem = ILconstNull.instance();
@@ -90,7 +95,7 @@ else if(index.getVal() == 0)
9095
return FirstOfGroup(group);
9196
return elem;
9297
}
93-
98+
9499
public ILconstInt BlzGroupAddGroupFast(IlConstHandle group, IlConstHandle groupAdd) {
95100
LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) groupAdd.getObj();
96101
groupList.addAll((LinkedHashSet<IlConstHandle>) group.getObj());
@@ -101,5 +106,5 @@ public ILconstInt BlzGroupRemoveGroupFast(IlConstHandle group, IlConstHandle gro
101106
LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) groupRm.getObj();
102107
groupList.removeAll((LinkedHashSet<IlConstHandle>) group.getObj());
103108
return ILconstInt.create(groupList.size());
104-
}
109+
}
105110
}

0 commit comments

Comments
 (0)