Fix WorldGuard accessing AreaEffectCloud#potion; Fix Bukkit#getOnlinePlayers returns nothing; for #1711, #1684

InitAuther97 · InitAuther97 · commit d2263723249b · 2025-03-12T22:27:28.000+08:00
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/DedicatedPlayerListMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/DedicatedPlayerListMixin.java
@@ -14,7 +14,7 @@
  */
 @Mixin(DedicatedPlayerList.class)
 public class DedicatedPlayerListMixin {
-    @Inject(method = "<init>", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/server/players/PlayerList;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PlayerDataStorage;I)V"))
+    @Inject(method = "<init>", at = @At(value = "TAIL"))
     private void arclight$afterSuper(CallbackInfo ci) {
         ((CraftServerBridge)Bukkit.getServer()).bridge$setPlayerList((DedicatedPlayerList)(Object) this);
     }
diff --git a/arclight-common/src/main/resources/META-INF/accesstransformer.cfg b/arclight-common/src/main/resources/META-INF/accesstransformer.cfg
@@ -1,4 +1,5 @@
 # Arclight 1.20
+public net.minecraft.world.entity.AreaEffectCloud f_19701_ # potion
 public net.minecraft.world.entity.item.FallingBlockEntity f_31947_ # cancelDrop
 public net.minecraft.server.dedicated.DedicatedServerProperties$WorldDimensionData <init>(Lcom/google/gson/JsonObject;Ljava/lang/String;)V
 public net.minecraft.world.entity.projectile.Arrow f_36855_ # potion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`@Mixin(DedicatedPlayerList.class)`
`16`	`16`	`public class DedicatedPlayerListMixin {`
`17`		`- @Inject(method = "<init>", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/server/players/PlayerList;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PlayerDataStorage;I)V"))`
	`17`	`+ @Inject(method = "<init>", at = @At(value = "TAIL"))`
`18`	`18`	`private void arclight$afterSuper(CallbackInfo ci) {`
`19`	`19`	`((CraftServerBridge)Bukkit.getServer()).bridge$setPlayerList((DedicatedPlayerList)(Object) this);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# Arclight 1.20`
	`2`	`+public net.minecraft.world.entity.AreaEffectCloud f_19701_ # potion`
`2`	`3`	`public net.minecraft.world.entity.item.FallingBlockEntity f_31947_ # cancelDrop`
`3`	`4`	`public net.minecraft.server.dedicated.DedicatedServerProperties$WorldDimensionData <init>(Lcom/google/gson/JsonObject;Ljava/lang/String;)V`
`4`	`5`	`public net.minecraft.world.entity.projectile.Arrow f_36855_ # potion`