Fix crash when fake players get summoned clientside

Ladysnake · May 3, 2021 · 8c1cf9f · 8c1cf9f
1 parent fc065ee
commit 8c1cf9f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+------------------------------------------------------
+Version 0.3.2
+------------------------------------------------------
+**Fixes**
+- Fixed a crash when a mod tried to create a fake player clientside
+
 ------------------------------------------------------
 Version 0.3.1
 ------------------------------------------------------

diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@
 # along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 #
 mod_name = Automatone
-mod_version = 0.3.1
+mod_version = 0.3.2
 maven_group = io.github.ladysnake
 
 fabric_version = 0.32.0+1.16

diff --git a/src/api/java/baritone/api/fakeplayer/FakeClientPlayerEntity.java b/src/api/java/baritone/api/fakeplayer/FakeClientPlayerEntity.java
@@ -38,6 +38,7 @@
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.network.OtherClientPlayerEntity;
 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.player.PlayerEntity;
@@ -49,6 +50,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.CheckForNull;
+import java.util.UUID;
 
 public class FakeClientPlayerEntity extends OtherClientPlayerEntity implements AutomatoneFakePlayer {
     protected PlayerListEntry listEntry;
@@ -59,6 +61,10 @@ public static <P extends PlayerEntity & AutomatoneFakePlayer> P createClientFake
         return factory.create(playerType, world, profile);
     }
 
+    public FakeClientPlayerEntity(EntityType<?> type, ClientWorld clientWorld) {
+        this(type, clientWorld, new GameProfile(UUID.randomUUID(), I18n.translate(type.getTranslationKey())));
+    }
+
     public FakeClientPlayerEntity(EntityType<?> type, ClientWorld clientWorld, GameProfile gameProfile) {
         super(clientWorld, gameProfile);
         ((IEntityAccessor)this).automatone$setType(type);

diff --git a/src/launch/resources/assets/automatone/lang/en_us.json b/src/launch/resources/assets/automatone/lang/en_us.json
@@ -0,0 +1,3 @@
+{
+  "entity.automatone.fake_player": "Fake Player"
+}
diff --git a/src/main/java/baritone/Automatone.java b/src/main/java/baritone/Automatone.java
@@ -17,12 +17,14 @@
 
 package baritone;
 
+import baritone.api.fakeplayer.FakeClientPlayerEntity;
 import baritone.api.fakeplayer.FakeServerPlayerEntity;
 import baritone.command.defaults.DefaultCommands;
 import baritone.command.manager.BaritoneArgumentType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
 import net.fabricmc.fabric.api.tag.TagRegistry;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.command.argument.ArgumentTypes;
 import net.minecraft.command.argument.serialize.ConstantArgumentSerializer;
 import net.minecraft.entity.EntityDimensions;
@@ -59,7 +61,9 @@ public final class Automatone implements ModInitializer {
 
     public static final EntityType<PlayerEntity> FAKE_PLAYER = FabricEntityTypeBuilder.<PlayerEntity>createLiving()
             .spawnGroup(SpawnGroup.MISC)
-            .entityFactory((type, world) -> new FakeServerPlayerEntity(type, (ServerWorld) world))
+            .entityFactory((type, world) -> world.isClient
+                    ? new FakeClientPlayerEntity(type, (ClientWorld) world)
+                    : new FakeServerPlayerEntity(type, (ServerWorld) world))
             .defaultAttributes(PlayerEntity::createPlayerAttributes)
             .dimensions(EntityDimensions.changing(EntityType.PLAYER.getWidth(), EntityType.PLAYER.getHeight()))
             .trackRangeBlocks(64)