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

Refactor Module into a single record type and fix system globals (#1383)

Browse Source
This commit is contained in:
altrisi authored and GitHub committed 2022-05-17 20:11:49 +02:00
1 parent d681cb4c54
commit a60bc386cb
20 files changed
+279 -215
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetEventServer.java
+5 -5
View File
@@ -1066,13 +1066,13 @@ public class CarpetEventServer
public static void removeAllHostEvents(CarpetScriptHost host)
{
byName.values().forEach((e) -> e.handler.removeAllCalls(host));
host.getScriptServer().events.customEvents.values().forEach((e) -> e.handler.removeAllCalls(host));
host.scriptServer().events.customEvents.values().forEach((e) -> e.handler.removeAllCalls(host));
}
public static void transferAllHostEventsToChild(CarpetScriptHost host)
{
byName.values().forEach((e) -> e.handler.createChildEvents(host));
host.getScriptServer().events.customEvents.values().forEach((e) -> e.handler.createChildEvents(host));
host.scriptServer().events.customEvents.values().forEach((e) -> e.handler.createChildEvents(host));
}
public static void clearAllBuiltinEvents()
@@ -1258,7 +1258,7 @@ public class CarpetEventServer
public int signalEvent(String event, CarpetContext cc, ServerPlayer optionalTarget, List<Value> callArgs)
{
Event ev = Event.getEvent(event, ((CarpetScriptHost)cc.host).getScriptServer());
Event ev = Event.getEvent(event, ((CarpetScriptHost)cc.host).scriptServer());
if (ev == null) return -1;
return ev.handler.signal(cc.s, optionalTarget, callArgs);
}
@@ -1285,7 +1285,7 @@ public class CarpetEventServer
}
public boolean removeBuiltInEvent(String event, CarpetScriptHost host)
{
Event ev = Event.getEvent(event, host.getScriptServer());
Event ev = Event.getEvent(event, host.scriptServer());
if (ev == null) return false;
ev.handler.removeAllCalls(host);
return true;
@@ -1293,7 +1293,7 @@ public class CarpetEventServer
public void removeBuiltInEvent(String event, CarpetScriptHost host, String funName)
{
Event ev = Event.getEvent(event, host.getScriptServer());
Event ev = Event.getEvent(event, host.scriptServer());
if (ev != null) ev.handler.removeEventCall(host.getName(), host.user, funName);
}