no violation of cause

Author: Faithcaio

src/main/java/org/spongepowered/common/SpongeCommon.java

@@ -103,16 +103,15 @@ public static RegistryAccess.Frozen vanillaRegistryAccess() {
     }
 
     public static SpongeRegistryHolder scopedHolder() {
-        var holder = PhaseTracker.getInstance().currentCause().first(SpongeRegistryHolder.class);
+        var holder = PhaseTracker.getInstance().startupRegistryHolder();
         // If we have a holder in scope use it directly unless it is game
-        if (holder.isEmpty() || holder.get() == SpongeCommon.game()) {
-
+        if (holder == null) {
             if (SpongeCommon.game().isServerAvailable()) {
                 return (SpongeRegistryHolder) SpongeCommon.server();
             }
             return SpongeCommon.game();
         }
-        return holder.get();
+        return holder;
     }
 
     public static <E> Registry<E> vanillaRegistry(ResourceKey<? extends Registry<? extends E>> key) {

src/main/java/org/spongepowered/common/SpongeLifecycle.java

@@ -212,8 +212,8 @@ public void beginEstablishServerRegistries(final RegistryHolder server) {
 
     @Override
     public void processServerRegistries(final RegistryHolder server, final Stream<? extends org.spongepowered.api.registry.Registry<?>> registries) {
-        try (var frame = PhaseTracker.getInstance().pushCauseFrame()) {
-            frame.pushCause(server);
+        try {
+            PhaseTracker.getInstance().startupRegistryHolder(server);
             final Map<RegistryType<?>, org.spongepowered.api.registry.Registry<?>> map =
                     registries.collect(Collectors.toMap(org.spongepowered.api.registry.Registry::type, Function.identity()));
             if (!map.isEmpty()) {
@@ -222,6 +222,8 @@ public void processServerRegistries(final RegistryHolder server, final Stream<?
                 map.values().forEach(r -> ((WritableRegistryBridge<?>) r).bridge$markEventCalled());
                 ((SpongeRegistryHolder) server).registryHolder().freezeSpongeDynamicRegistries(false);
             }
+        } finally {
+            PhaseTracker.getInstance().startupRegistryHolder(null);
         }
     }
 

src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java

@@ -49,6 +49,7 @@
 import org.spongepowered.api.event.EventContext;
 import org.spongepowered.api.event.EventContextKey;
 import org.spongepowered.api.event.EventContextKeys;
+import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.api.scheduler.Task;
 import org.spongepowered.api.util.Ticks;
 import org.spongepowered.common.SpongeCommon;
@@ -59,6 +60,7 @@
 import org.spongepowered.common.event.tracking.phase.plugin.PluginPhase;
 import org.spongepowered.common.event.tracking.phase.tick.TickPhase;
 import org.spongepowered.common.launch.Launch;
+import org.spongepowered.common.registry.SpongeRegistryHolder;
 import org.spongepowered.common.util.Constants;
 import org.spongepowered.common.util.Preconditions;
 import org.spongepowered.common.util.PrettyPrinter;
@@ -259,6 +261,7 @@ public static Block validateBlockForNeighborNotification(final ServerLevel world
     private final Deque<PhaseContext<?>> phaseContextProviders = new ArrayDeque<>();
     final PhaseStack stack = new PhaseStack();
     private final SpongeCauseStackManager api = new SpongeCauseStackManager();
+    private @Nullable SpongeRegistryHolder startupRegistryHolder;
 
     PhaseTracker() {
         for (int i = 0; i < PhaseTracker.INITIAL_POOL_SIZE; i++) {
@@ -868,6 +871,18 @@ public CauseStackManager apiAccess() {
         return this.api;
     }
 
+    public void startupRegistryHolder(final RegistryHolder holder) {
+        if (holder instanceof SpongeRegistryHolder srh) {
+            this.startupRegistryHolder = srh;
+        } else {
+            this.startupRegistryHolder = null;
+        }
+    }
+
+    public @Nullable SpongeRegistryHolder startupRegistryHolder() {
+        return this.startupRegistryHolder;
+    }
+
     /**
      * We insert implicit phases for plugin created frames.
      */