Fix reconnection logic

This commit is contained in:
s809
2024-03-30 23:40:17 +05:00
parent 2008ea2b0c
commit e102cd78cd
3 changed files with 24 additions and 3 deletions
@@ -22,6 +22,7 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
import java.io.File;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import com.mojang.blaze3d.platform.NativeImage;
@@ -31,6 +32,7 @@ import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
import com.seibel.distanthorizons.core.config.Config;
import com.seibel.distanthorizons.core.enums.EDhDirection;
import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
import com.seibel.distanthorizons.coreapi.ModInfo;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -323,6 +325,12 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
return this.mc.gameDirectory;
}
@Override
public List<IServerPlayerWrapper> getPlayerList()
{
return null;
}
@Override
public void executeOnRenderThread(Runnable runnable) { this.mc.execute(runnable); }
@@ -1,9 +1,12 @@
package com.seibel.distanthorizons.common.wrappers.minecraft;
import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
import net.minecraft.server.dedicated.DedicatedServer;
import java.io.File;
import java.util.List;
//@Environment(EnvType.SERVER)
public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper
@@ -19,9 +22,19 @@ public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper
@Override
public File getInstallationDirectory()
{
if (dedicatedServer == null)
if (this.dedicatedServer == null)
{
throw new IllegalStateException("Trying to get Installation Direction before Dedicated server complete initialization!");
return dedicatedServer.getServerDirectory();
}
return this.dedicatedServer.getServerDirectory();
}
@Override
public List<IServerPlayerWrapper> getPlayerList()
{
return this.dedicatedServer.getPlayerList().getPlayers().stream()
.map(serverPlayer -> (IServerPlayerWrapper) ServerPlayerWrapper.getWrapper(serverPlayer))
.toList();
}
}