icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source
This commit is contained in:
gnembon committed 2021-06-01 03:54:07 -03:00
2 parents 875545711b 0308124f00
commit cef1dd4f8e
1 file changed
+1 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/EntityEventsGroup.java
+1 -2
View File
@@ -33,8 +33,7 @@ public class EntityEventsGroup
if (actions.isEmpty()) return; // most of the cases, trying to be nice if (actions.isEmpty()) return; // most of the cases, trying to be nice
Map<Pair<String,String>, CarpetEventServer.Callback> actionSet = actions.get(type); Map<Pair<String,String>, CarpetEventServer.Callback> actionSet = actions.get(type);
if (actionSet == null) return; if (actionSet == null) return;
if (CarpetServer.scriptServer == null) return; // executed after world is closin down
for (Iterator<Map.Entry<Pair<String,String>, CarpetEventServer.Callback>> iterator = actionSet.entrySet().iterator(); iterator.hasNext(); ) for (Iterator<Map.Entry<Pair<String,String>, CarpetEventServer.Callback>> iterator = actionSet.entrySet().iterator(); iterator.hasNext(); )
{ {
Map.Entry<Pair<String,String>, CarpetEventServer.Callback> action = iterator.next(); Map.Entry<Pair<String,String>, CarpetEventServer.Callback> action = iterator.next();