Merge branch 'master' into future

src/main/java/carpet/commands/PerimeterInfoCommand.java

@@ -52,7 +52,7 @@ public class PerimeterInfoCommand
         {
             nbttagcompound.putString("id", mobId);
             Entity baseEntity = EntityType.loadEntityWithPassengers(nbttagcompound, source.getWorld(), (entity_1x) -> {
-                entity_1x.refreshPositionAndAngles(new BlockPos(pos.getX(), -10, pos.getZ()), entity_1x.getYaw(), entity_1x. getPitch());
+                entity_1x.refreshPositionAndAngles(new BlockPos(pos.getX(), source.getWorld().getBottomY()-10, pos.getZ()), entity_1x.getYaw(), entity_1x. getPitch());
                 return !source.getWorld().tryLoadEntity(entity_1x) ? null : entity_1x;
             });
             if (!(baseEntity instanceof  MobEntity))

src/main/java/carpet/commands/ScriptCommand.java

@@ -319,7 +319,7 @@ public class ScriptCommand
                         then(argument("event", StringArgumentType.word()).
                                 suggests( (cc, bb) -> suggestMatching(CarpetEventServer.Event.publicEvents(CarpetServer.scriptServer).stream().filter(CarpetEventServer.Event::isNeeded).map(ev -> ev.name).collect(Collectors.toList()) ,bb)).
                                 then(argument("call", StringArgumentType.greedyString()).
-                                        suggests( (cc, bb) -> suggestMatching(CarpetEventServer.Event.getEvent(StringArgumentType.getString(cc, "event"), CarpetServer.scriptServer).handler.callList.stream().map(CarpetEventServer.Callback::toString), bb)).
+                                        suggests( (cc, bb) -> suggestMatching(CarpetEventServer.Event.getEvent(StringArgumentType.getString(cc, "event"), CarpetServer.scriptServer).handler.inspectCurrentCalls().stream().map(CarpetEventServer.Callback::toString), bb)).
                                         executes( (cc) -> CarpetServer.scriptServer.events.removeEventFromCommand(
                                                 cc.getSource(),
                                                 StringArgumentType.getString(cc, "event"),
@@ -376,7 +376,7 @@ public class ScriptCommand
         for (CarpetEventServer.Event event: CarpetEventServer.Event.getAllEvents(CarpetServer.scriptServer, null))
         {
             boolean shownEvent = false;
-            for (CarpetEventServer.Callback c: event.handler.callList)
+            for (CarpetEventServer.Callback c: event.handler.inspectCurrentCalls())
             {
                 if (!shownEvent)
                 {

src/main/java/carpet/mixins/WorldRenderer_pausedShakeMixin.java

@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
-@Mixin(WorldRenderer.class)
+@Mixin(value = WorldRenderer.class, priority = 69420)
 public class WorldRenderer_pausedShakeMixin
 {
     @Shadow @Final private MinecraftClient client;

src/main/java/carpet/script/CarpetEventServer.java

@@ -174,7 +174,10 @@ public class CarpetEventServer
     public static class CallbackList
     {
 
-        public final List<Callback> callList;
+        private List<Callback> callList;
+        private final List<Callback> removedCalls;
+        private boolean inCall;
+        private boolean inSignal;
         public final int reqArgs;
         final boolean isSystem;
         final boolean perPlayerDistribution;
@@ -182,11 +185,34 @@ public class CarpetEventServer
         public CallbackList(int reqArgs, boolean isSystem, boolean isGlobalOnly)
         {
             this.callList = new ArrayList<>();
+            this.removedCalls = new ArrayList<>();
+            this.inCall = false;
+            this.inSignal = false;
             this.reqArgs = reqArgs;
             this.isSystem = isSystem;
             perPlayerDistribution = isSystem && !isGlobalOnly;
         }
 
+        public List<Callback> inspectCurrentCalls()
+        {
+            return new ArrayList<>(callList);
+        }
+
+        private void removeCallsIf(Predicate<Callback> when)
+        {
+            if (!inCall && !inSignal)
+            {
+                callList.removeIf(when);
+                return;
+            }
+            // we are ok with list growing in the meantime and parallel access, we are only scanning.
+            for (int i = 0; i < callList.size(); i++)
+            {
+                Callback call = callList.get(i);
+                if (when.test(call)) removedCalls.add(call);
+            }
+        }
+
         /**
          * Handles only built-in events from the events system
          * @param argumentSupplier
@@ -210,15 +236,26 @@ public class CarpetEventServer
                     }
                     String nameCheck = perPlayerDistribution ? source.getName() : null;
                     assert argv.size() == reqArgs;
-                    List<Callback> fails = new ArrayList<>();
-                    for (Callback call : callList)
+                    try
                     {
+                        // we are ok with list growing in the meantime
+                        // which might happen during inCall or inSignal
+                        inCall = true;
+                        for (int i = 0; i < callList.size(); i++)
+                        {
+                            Callback call = callList.get(i);
                             // supressing calls where target player hosts simply don't match
                             // handling global hosts with player targets is left to when the host is resolved (few calls deeper).
                             if (nameCheck != null && call.optionalTarget != null && !nameCheck.equals(call.optionalTarget)) continue;
-                        if (call.execute(source, argv) == CallbackResult.FAIL) fails.add(call);
+                            if (call.execute(source, argv) == CallbackResult.FAIL) removedCalls.add(call);
                         }
-                    for (Callback call : fails) callList.remove(call);
+                    }
+                    finally
+                    {
+                        inCall = false;
+                    }
+                    for (Callback call : removedCalls) callList.remove(call);
+                    removedCalls.clear();
                     CarpetProfiler.end_current_section(currentSection);
                 });
             }
@@ -227,16 +264,20 @@ public class CarpetEventServer
         public int signal(ServerCommandSource sender, ServerPlayerEntity optinoalReceipient, List<Value> callArg)
         {
             if (callList.isEmpty()) return 0;
-            //List<Callback> fails = new ArrayList<>();
-            // skipping fails on purpose - its a player induced call.
             int successes = 0;
-            for (Callback call: callList)
+            try
             {
-                //successes +=  Math.max(0, call.signal(sender, optinoalReceipient, callArg));
-                if (call.signal(sender, optinoalReceipient, callArg) == CallbackResult.SUCCESS) successes ++;
-
+                inSignal = true;
+                for (int i = 0; i < callList.size(); i++)
+                {
+                    // skipping tracking of fails, its explicit call
+                    if (callList.get(i).signal(sender, optinoalReceipient, callArg) == CallbackResult.SUCCESS) successes++;
+                }
+            }
+            finally
+            {
+                inSignal = false;
             }
-            //for (Callback call : fails) callList.remove(call);
             return successes;
         }
 
@@ -283,8 +324,7 @@ public class CarpetEventServer
             {
                 return false;
             }
-            //all clear
-            //remove duplicates
+            //removing duplicates
             removeEventCall(host.getName(), host.user, function.getString());
             callList.add(new Callback(host.getName(), host.user, function, args));
             return true;
@@ -292,7 +332,7 @@ public class CarpetEventServer
 
         public void removeEventCall(String hostName, String target, String funName)
         {
-            callList.removeIf((c)->  c.function.getString().equals(funName)
+            removeCallsIf((c)->  c.function.getString().equals(funName)
                     && (Objects.equals(c.host, hostName))
                     && (Objects.equals(c.optionalTarget, target))
             );
@@ -300,7 +340,7 @@ public class CarpetEventServer
 
         public void removeAllCalls(CarpetScriptHost host)
         {
-            callList.removeIf((c)-> (Objects.equals(c.host, host.getName()))
+            removeCallsIf((c)-> (Objects.equals(c.host, host.getName()))
                     && (Objects.equals(c.optionalTarget, host.user)));
         }
 
@@ -320,6 +360,8 @@ public class CarpetEventServer
 
         public void clearEverything()
         {
+            // when some moron puts /reload in an event call.
+            if (inSignal || inCall) callList = new ArrayList<>();
             callList.clear();
         }
     }

src/main/java/carpet/utils/PerimeterDiagnostics.java

@@ -89,6 +89,8 @@ public class PerimeterDiagnostics
         PerimeterDiagnostics diagnostic = new PerimeterDiagnostics(worldserver,ctype,el);
         EntityType type = EntityType.ZOMBIE;
         if (el != null) type = el.getType();
+        int minY = worldserver.getBottomY();
+        int maxY = worldserver.getTopY();
         for (int x = -128; x <= 128; ++x)
         {
             for (int z = -128; z <= 128; ++z)
@@ -97,7 +99,7 @@ public class PerimeterDiagnostics
                 {
                     continue;
                 }
-                for (int y= 0; y < 256; ++y)
+                for (int y= minY; y < maxY; ++y)
                 {
                     if ((Math.abs(y-eY)>128) )
                     {