fix: Access handling for playees

SpongePowered · May 18, 2024 · dc3b827 · dc3b827
1 parent cb2b0df
commit dc3b827
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerPlayerMixin_API.java b/...java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerPlayerMixin_API.java
@@ -468,7 +468,7 @@ public void sendMessage(final @NonNull Component message, final net.kyori.advent
         if (this.impl$isFake) {
             return;
         }
-        this.connection.sendDisguisedChatMessage(SpongeAdventure.asVanilla(message), SpongeAdventure.asVanilla(this.level.registryAccess(), boundChatType));
+        this.connection.sendDisguisedChatMessage(SpongeAdventure.asVanilla(message), SpongeAdventure.asVanilla(this.shadow$level().registryAccess(), boundChatType));
     }
 
     @Override
@@ -479,7 +479,7 @@ public void sendMessage(final @NonNull SignedMessage signedMessage, final net.ky
         // TODO: implement once we actually expose a way to get signed messages in-api
         this.connection.sendDisguisedChatMessage(
             SpongeAdventure.asVanilla(Objects.requireNonNullElse(signedMessage.unsignedContent(), Component.text(signedMessage.message()))),
-            SpongeAdventure.asVanilla(this.level.registryAccess(), boundChatType)
+            SpongeAdventure.asVanilla(this.shadow$level().registryAccess(), boundChatType)
         );
     }
 

diff --git a/...ixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/EntityMixin_API.java b/...ixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/EntityMixin_API.java
@@ -36,6 +36,7 @@
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.RelativeMovement;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.data.Keys;
@@ -80,17 +81,17 @@
 public abstract class EntityMixin_API implements org.spongepowered.api.entity.Entity {
 
     // @formatter:off
-    @Shadow public float yRot;
-    @Shadow public float xRot;
+    @Shadow private float yRot;
+    @Shadow private float xRot;
     @Shadow @Final protected net.minecraft.util.RandomSource random;
     @Shadow protected UUID uuid;
     @Shadow @Final private net.minecraft.world.entity.EntityType<?> type;
-    @Shadow public net.minecraft.world.level.Level level;
+    @Shadow private Level level;
 
     @Shadow public abstract double shadow$getX();
     @Shadow public abstract double shadow$getY();
     @Shadow public abstract double shadow$getZ();
-    @Shadow public abstract net.minecraft.world.level.Level shadow$getCommandSenderWorld();
+    @Shadow public abstract Level shadow$getCommandSenderWorld();
     @Shadow @Nullable public abstract MinecraftServer shadow$getServer();
     @Shadow public abstract boolean shadow$isRemoved();
     @Shadow public abstract UUID shadow$getUUID();
@@ -101,6 +102,7 @@ public abstract class EntityMixin_API implements org.spongepowered.api.entity.En
     @Shadow public abstract void shadow$discard();
     @Shadow public abstract void shadow$lookAt(EntityAnchorArgument.Anchor param0, Vec3 param1);
     @Shadow public abstract CompoundTag shadow$saveWithoutId(CompoundTag $$0);
+    @Shadow public abstract Level shadow$level();
     // @formatter:on
 
     @Override