hytale/Hytale-Server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2026.02.19-1a311a592

Browse Source
This commit is contained in:
Intege-rs
2026-04-07 22:33:46 -04:00
parent 98945aa42e
commit 689be8743e
6 changed files with 78 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/hypixel/hytale/builtin/adventure/memories/MemoriesPlugin.java
View File

@@ -128,15 +128,14 @@ public class MemoriesPlugin extends JavaPlugin {
@Override
protected void start() {
try {
Path path = Constants.UNIVERSE_PATH.resolve("memories.json");
if (Files.exists(path)) {
this.recordedMemories = RawJsonReader.readSync(path, MemoriesPlugin.RecordedMemories.CODEC, this.getLogger());
} else {
Path path = Constants.UNIVERSE_PATH.resolve("memories.json");
if (Files.exists(path)) {
this.recordedMemories = RawJsonReader.readSyncWithBak(path, MemoriesPlugin.RecordedMemories.CODEC, this.getLogger());
if (this.recordedMemories == null) {
this.recordedMemories = new MemoriesPlugin.RecordedMemories();
}
} catch (IOException var2) {
throw new RuntimeException(var2);
} else {
this.recordedMemories = new MemoriesPlugin.RecordedMemories();
}
this.hasInitializedMemories = true;

38
src/com/hypixel/hytale/component/ArchetypeChunk.java
View File

@@ -232,7 +232,6 @@ public class ArchetypeChunk<ECS_TYPE> {
@Nonnull IntObjectConsumer<Ref<ECS_TYPE>> referenceConsumer
) {
int firstTransfered = Integer.MIN_VALUE;
int lastTransfered = Integer.MIN_VALUE;
Component<ECS_TYPE>[] entityComponents = new Component[this.archetype.length()];
for (int entityIndex = 0; entityIndex < this.entitiesSize; entityIndex++) {
@@ -241,7 +240,6 @@ public class ArchetypeChunk<ECS_TYPE> {
firstTransfered = entityIndex;
}
lastTransfered = entityIndex;
Ref<ECS_TYPE> ref = this.refs[entityIndex];
this.refs[entityIndex] = null;
@@ -263,29 +261,31 @@ public class ArchetypeChunk<ECS_TYPE> {
}
if (firstTransfered != Integer.MIN_VALUE) {
if (lastTransfered == this.entitiesSize - 1) {
this.entitiesSize = firstTransfered;
return;
}
int writeIndex = firstTransfered;
int newSize = this.entitiesSize - (lastTransfered - firstTransfered + 1);
for (int entityIndexx = firstTransfered; entityIndexx <= lastTransfered; entityIndexx++) {
if (this.refs[entityIndexx] == null) {
int lastIndex = this.entitiesSize - 1;
if (lastIndex == lastTransfered) {
break;
for (int readIndex = firstTransfered + 1; readIndex < this.entitiesSize; readIndex++) {
if (this.refs[readIndex] != null) {
if (writeIndex != readIndex) {
this.fillEmptyIndex(writeIndex, readIndex);
}
if (entityIndexx != lastIndex) {
this.fillEmptyIndex(entityIndexx, lastIndex);
}
this.entitiesSize--;
writeIndex++;
}
}
this.entitiesSize = newSize;
for (int ix = writeIndex; ix < this.entitiesSize; ix++) {
this.refs[ix] = null;
for (int j = this.archetype.getMinIndex(); j < this.archetype.length(); j++) {
ComponentType<ECS_TYPE, ? extends Component<ECS_TYPE>> componentType = (ComponentType<ECS_TYPE, ? extends Component<ECS_TYPE>>)this.archetype
.get(j);
if (componentType != null) {
this.components[componentType.getIndex()][ix] = null;
}
}
}
this.entitiesSize = writeIndex;
}
}

11
src/com/hypixel/hytale/server/core/asset/AssetModule.java
View File

@@ -17,7 +17,6 @@ import com.hypixel.hytale.common.util.PathUtil;
import com.hypixel.hytale.common.util.java.ManifestUtil;
import com.hypixel.hytale.event.EventPriority;
import com.hypixel.hytale.logger.HytaleLogger;
import com.hypixel.hytale.server.core.Constants;
import com.hypixel.hytale.server.core.HytaleServer;
import com.hypixel.hytale.server.core.HytaleServerConfig;
import com.hypixel.hytale.server.core.Message;
@@ -54,7 +53,6 @@ import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -161,15 +159,6 @@ public class AssetModule extends JavaPlugin {
this.getLogger()
.at(Level.SEVERE)
.log("One or more asset packs are targeting an older server version. It is recommended to update these plugins to ensure compatibility.");
try {
if (!Constants.SINGLEPLAYER) {
Thread.sleep(Duration.ofSeconds(2L));
}
} catch (InterruptedException var9) {
throw new RuntimeException(var9);
}
HytaleServer.get().getEventBus().registerGlobal(AddPlayerToWorldEvent.class, event -> {
PlayerRef playerRef = event.getHolder().getComponent(PlayerRef.getComponentType());
Player player = event.getHolder().getComponent(Player.getComponentType());

2
src/com/hypixel/hytale/server/core/plugin/PluginClassLoader.java
View File

@@ -157,7 +157,7 @@ public class PluginClassLoader extends URLClassLoader {
public static boolean isFromThirdPartyPlugin(@Nullable Throwable throwable) {
while (throwable != null) {
for (StackTraceElement element : throwable.getStackTrace()) {
if ("ThirdParty".equals(element.getClassLoaderName())) {
if (element.getClassLoaderName() != null && element.getClassLoaderName().startsWith("ThirdParty")) {
return true;
}
}

30
src/com/hypixel/hytale/server/core/plugin/PluginManager.java
View File

@@ -51,7 +51,6 @@ import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -157,8 +156,8 @@ public class PluginManager {
Path self;
try {
self = Paths.get(PluginManager.class.getProtectionDomain().getCodeSource().getLocation().toURI());
} catch (URISyntaxException var30) {
throw new RuntimeException(var30);
} catch (URISyntaxException var28) {
throw new RuntimeException(var28);
}
this.loadPluginsFromDirectory(pending, self.getParent().resolve("builtin"), false, this.availablePlugins);
@@ -183,8 +182,8 @@ public class PluginManager {
try {
this.validatePluginDeps(pendingLoadPlugin, pending);
} catch (MissingPluginDependencyException var29) {
LOGGER.at(Level.SEVERE).log(var29.getMessage());
} catch (MissingPluginDependencyException var27) {
LOGGER.at(Level.SEVERE).log(var27.getMessage());
iterator.remove();
}
}
@@ -195,15 +194,6 @@ public class PluginManager {
if (this.hasOutdatedPlugins && System.getProperty("hytale.allow_outdated_mods") == null) {
LOGGER.at(Level.SEVERE)
.log("One or more plugins are targeting a different server version. It is recommended to update these plugins to ensure compatibility.");
try {
if (!Constants.SINGLEPLAYER) {
Thread.sleep(Duration.ofSeconds(2L));
}
} catch (InterruptedException var32) {
throw new RuntimeException(var32);
}
HytaleServer.get().getEventBus().registerGlobal(AddPlayerToWorldEvent.class, event -> {
PlayerRef playerRef = event.getHolder().getComponent(PlayerRef.getComponentType());
Player player = event.getHolder().getComponent(Player.getComponentType());
@@ -236,14 +226,14 @@ public class PluginManager {
if (future != null) {
preLoadFutures.add(future);
}
} catch (ClassNotFoundException var26) {
LOGGER.at(Level.SEVERE).withCause(var26).log("Failed to load plugin %s. Failed to find main class!", pendingLoadPlugin.getPath());
} catch (ClassNotFoundException var24) {
LOGGER.at(Level.SEVERE).withCause(var24).log("Failed to load plugin %s. Failed to find main class!", pendingLoadPlugin.getPath());
failedBootPlugins.add(pendingLoadPlugin.getIdentifier());
} catch (NoSuchMethodException var27) {
LOGGER.at(Level.SEVERE).withCause(var27).log("Failed to load plugin %s. Requires default constructor!", pendingLoadPlugin.getPath());
} catch (NoSuchMethodException var25) {
LOGGER.at(Level.SEVERE).withCause(var25).log("Failed to load plugin %s. Requires default constructor!", pendingLoadPlugin.getPath());
failedBootPlugins.add(pendingLoadPlugin.getIdentifier());
} catch (Throwable var28) {
LOGGER.at(Level.SEVERE).withCause(var28).log("Failed to load plugin %s", pendingLoadPlugin.getPath());
} catch (Throwable var26) {
LOGGER.at(Level.SEVERE).withCause(var26).log("Failed to load plugin %s", pendingLoadPlugin.getPath());
failedBootPlugins.add(pendingLoadPlugin.getIdentifier());
}
}

84
src/com/hypixel/hytale/server/spawning/world/system/WorldSpawningSystem.java
View File

@@ -249,42 +249,42 @@ public class WorldSpawningSystem extends TickingSystem<ChunkStore> {
boolean fullyPopulated = true;
if (wasFullyPopulated) {
for (Ref<ChunkStore> chunkRef : chunkRefSet) {
ChunkSpawnData chunkSpawnDataComponent = store.getComponent(chunkRef, this.chunkSpawnDataComponentType);
assert chunkSpawnDataComponent != null;
ChunkSpawnedNPCData chunkSpawnedNPCDataComponent = store.getComponent(chunkRef, this.chunkSpawnedNPCDataComponentType);
assert chunkSpawnedNPCDataComponent != null;
ChunkEnvironmentSpawnData chunkEnvironmentSpawnData = chunkSpawnDataComponent.getEnvironmentSpawnData(environmentIndex);
fullyPopulated = fullyPopulated
&& chunkEnvironmentSpawnData.isFullyPopulated(chunkSpawnedNPCDataComponent.getEnvironmentSpawnCount(environmentIndex));
if (chunkEnvironmentSpawnData.isRoleSpawnable(roleIndex)) {
spawnable = true;
weight += store.getComponent(chunkRef, this.spawnJobDataComponentType) == null && !getAndUpdateSpawnCooldown(chunkSpawnDataComponent)
? 1.0
: 0.0;
if (chunkRef.isValid()) {
ChunkSpawnData chunkSpawnDataComponent = store.getComponent(chunkRef, this.chunkSpawnDataComponentType);
if (chunkSpawnDataComponent != null) {
ChunkSpawnedNPCData chunkSpawnedNPCDataComponent = store.getComponent(chunkRef, this.chunkSpawnedNPCDataComponentType);
if (chunkSpawnedNPCDataComponent != null) {
ChunkEnvironmentSpawnData chunkEnvironmentSpawnData = chunkSpawnDataComponent.getEnvironmentSpawnData(environmentIndex);
fullyPopulated = fullyPopulated
&& chunkEnvironmentSpawnData.isFullyPopulated(chunkSpawnedNPCDataComponent.getEnvironmentSpawnCount(environmentIndex));
if (chunkEnvironmentSpawnData.isRoleSpawnable(roleIndex)) {
spawnable = true;
weight += store.getComponent(chunkRef, this.spawnJobDataComponentType) == null && !getAndUpdateSpawnCooldown(chunkSpawnDataComponent)
? 1.0
: 0.0;
}
}
}
}
}
} else {
for (Ref<ChunkStore> chunkRef : chunkRefSet) {
ChunkSpawnData chunkSpawnDataComponentx = store.getComponent(chunkRef, this.chunkSpawnDataComponentType);
assert chunkSpawnDataComponentx != null;
ChunkSpawnedNPCData chunkSpawnedNPCDataComponentx = store.getComponent(chunkRef, this.chunkSpawnedNPCDataComponentType);
assert chunkSpawnedNPCDataComponentx != null;
ChunkEnvironmentSpawnData chunkEnvironmentSpawnData = chunkSpawnDataComponentx.getEnvironmentSpawnData(environmentIndex);
double spawnCount = chunkSpawnedNPCDataComponentx.getEnvironmentSpawnCount(environmentIndex);
fullyPopulated = fullyPopulated && chunkEnvironmentSpawnData.isFullyPopulated(spawnCount);
if (chunkEnvironmentSpawnData.isRoleSpawnable(roleIndex)) {
spawnable = true;
weight += store.getComponent(chunkRef, this.spawnJobDataComponentType) == null && !getAndUpdateSpawnCooldown(chunkSpawnDataComponentx)
? chunkEnvironmentSpawnData.getWeight(spawnCount)
: 0.0;
for (Ref<ChunkStore> chunkRefx : chunkRefSet) {
if (chunkRefx.isValid()) {
ChunkSpawnData chunkSpawnDataComponent = store.getComponent(chunkRefx, this.chunkSpawnDataComponentType);
if (chunkSpawnDataComponent != null) {
ChunkSpawnedNPCData chunkSpawnedNPCDataComponent = store.getComponent(chunkRefx, this.chunkSpawnedNPCDataComponentType);
if (chunkSpawnedNPCDataComponent != null) {
ChunkEnvironmentSpawnData chunkEnvironmentSpawnData = chunkSpawnDataComponent.getEnvironmentSpawnData(environmentIndex);
double spawnCount = chunkSpawnedNPCDataComponent.getEnvironmentSpawnCount(environmentIndex);
fullyPopulated = fullyPopulated && chunkEnvironmentSpawnData.isFullyPopulated(spawnCount);
if (chunkEnvironmentSpawnData.isRoleSpawnable(roleIndex)) {
spawnable = true;
weight += store.getComponent(chunkRefx, this.spawnJobDataComponentType) == null && !getAndUpdateSpawnCooldown(chunkSpawnDataComponent)
? chunkEnvironmentSpawnData.getWeight(spawnCount)
: 0.0;
}
}
}
}
}
}
@@ -293,8 +293,8 @@ public class WorldSpawningSystem extends TickingSystem<ChunkStore> {
if (spawnable) {
return RandomExtra.randomWeightedElement(
chunkRefSet,
(chunkRefx, index) -> {
ChunkSpawnData chunkSpawnDataComponent = store.getComponent(chunkRefx, this.chunkSpawnDataComponentType);
(chunkRefxx, index) -> {
ChunkSpawnData chunkSpawnDataComponent = store.getComponent(chunkRefxx, this.chunkSpawnDataComponentType);
assert chunkSpawnDataComponent != null;
@@ -302,24 +302,24 @@ public class WorldSpawningSystem extends TickingSystem<ChunkStore> {
return chunkEnvironmentSpawnDatax.isRoleSpawnable(index);
},
wasFullyPopulated
? (chunkRefx, index) -> {
ChunkSpawnData spawnChunkDataComponent = store.getComponent(chunkRefx, this.chunkSpawnDataComponentType);
? (chunkRefxx, index) -> {
ChunkSpawnData spawnChunkDataComponent = store.getComponent(chunkRefxx, this.chunkSpawnDataComponentType);
assert spawnChunkDataComponent != null;
return store.getComponent(chunkRefx, this.spawnJobDataComponentType) == null && !spawnChunkDataComponent.isOnSpawnCooldown() ? 1.0 : 0.0;
return store.getComponent(chunkRefxx, this.spawnJobDataComponentType) == null && !spawnChunkDataComponent.isOnSpawnCooldown() ? 1.0 : 0.0;
}
: (chunkRefx, index) -> {
ChunkSpawnData chunkSpawnDataComponent = store.getComponent(chunkRefx, this.chunkSpawnDataComponentType);
: (chunkRefxx, index) -> {
ChunkSpawnData chunkSpawnDataComponent = store.getComponent(chunkRefxx, this.chunkSpawnDataComponentType);
assert chunkSpawnDataComponent != null;
ChunkSpawnedNPCData chunkSpawnedNPCDataComponentx = store.getComponent(chunkRefx, this.chunkSpawnedNPCDataComponentType);
ChunkSpawnedNPCData chunkSpawnedNPCDataComponentx = store.getComponent(chunkRefxx, this.chunkSpawnedNPCDataComponentType);
assert chunkSpawnedNPCDataComponentx != null;
ChunkEnvironmentSpawnData chunkEnvironmentSpawnDatax = chunkSpawnDataComponent.getEnvironmentSpawnData(environmentIndex);
return store.getComponent(chunkRefx, this.spawnJobDataComponentType) == null && !chunkSpawnDataComponent.isOnSpawnCooldown()
return store.getComponent(chunkRefxx, this.spawnJobDataComponentType) == null && !chunkSpawnDataComponent.isOnSpawnCooldown()
? chunkEnvironmentSpawnDatax.getWeight(chunkSpawnedNPCDataComponentx.getEnvironmentSpawnCount(environmentIndex))
: 0.0;
},