Skip to content

Commit 4e7b0d8

Browse files
committed
Fix scaffolding issue
1 parent a310bce commit 4e7b0d8

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ dependencies {
8989
modRuntimeOnly "maven.modrinth:keybind-fix:1.0.0"
9090

9191
modImplementation include("com.github.Chocohead:Fabric-ASM:v2.3")
92-
modImplementation include("com.github.minefortress-mod:automatone:1.0.8-minefortress")
92+
modImplementation include("com.github.minefortress-mod:automatone:1.0.9-minefortress")
9393
modImplementation include("com.github.minefortress-mod.minefortress-cc-api:cardinal-components-base:5.2.9-minefortress")
9494
modImplementation include("com.github.minefortress-mod.minefortress-cc-api:cardinal-components-entity:5.2.9-minefortress")
9595
modImplementation include("com.github.minefortress-mod.minefortress-cc-api:cardinal-components-world:5.2.9-minefortress")

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx4G
88
loader_version=0.14.24
99

1010
# Mod Properties
11-
mod_version=1.17.0-beta
11+
mod_version=1.17.1-beta
1212
maven_group = org.minefortress
1313
archives_base_name = minefortress
1414

src/main/java/org/minefortress/entity/BasePawnEntity.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import net.minecraft.entity.player.PlayerEntity;
1616
import net.minecraft.nbt.NbtCompound;
1717
import net.minecraft.server.MinecraftServer;
18+
import net.minecraft.server.network.ServerPlayerEntity;
1819
import net.minecraft.util.math.BlockPos;
1920
import net.minecraft.util.math.Box;
2021
import net.minecraft.world.LocalDifficulty;
@@ -45,6 +46,8 @@ public abstract class BasePawnEntity extends HungryEntity implements IFortressAw
4546
private static final TrackedData<Integer> BODY_TEXTURE_ID = DataTracker.registerData(BasePawnEntity.class, TrackedDataHandlerRegistry.INTEGER);
4647
private static final TrackedData<PawnSkin> PAWN_SKIN = DataTracker.registerData(BasePawnEntity.class, MineFortressMod.PAWN_SKIN_TRACKED_DATA_HANDLER);
4748

49+
private volatile ServerPlayerEntity serverPlayer;
50+
4851
protected BasePawnEntity(EntityType<? extends BasePawnEntity> entityType, World world, boolean enableHunger) {
4952
super(entityType, world, enableHunger);
5053
}
@@ -111,10 +114,15 @@ public BlockPos getFortressPos() {
111114

112115
@Override
113116
public final @Nullable PlayerEntity getPlayer() {
117+
if (this.serverPlayer != null && !this.serverPlayer.isDisconnected()) {
118+
return this.serverPlayer;
119+
}
120+
114121
final var server = this.getServer();
115122
final var fortressPos = this.getFortressPos();
116123
if (fortressPos == null) return null;
117-
return ServerExtensionsKt.getFortressOwner(server, fortressPos);
124+
server.submit(() -> ServerExtensionsKt.getFortressOwner(server, fortressPos)).thenAccept(it -> this.serverPlayer = it);
125+
return serverPlayer;
118126
}
119127

120128
@Override

0 commit comments

Comments
 (0)