virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-20 00:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

move entity spawning to the server loop to fix C2ME crash

Browse source 
move checkplayers to Data from FileData
This commit is contained in:
Oth3r 2024-08-17 13:27:26 -05:00
commit 757ee9668a
5 changed files with 56 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/one/oth3r/sit/utl/LoopManager.java
View file

@ -30,13 +30,13 @@ public class LoopManager {
// get the player's sit entity when they join
// todo make it so it updates the sitting height and pos based on the block so if it changed while offline it still works (or if stair changes shape)
HashMap<ServerPlayerEntity, Integer> checkPlayers = FileData.getCheckPlayers();
HashMap<ServerPlayerEntity, Integer> checkPlayers = Data.getCheckPlayers();
for (ServerPlayerEntity player : checkPlayers.keySet()) {
Integer time = checkPlayers.get(player);
// tick down or remove the player if at the end
time -= 1;
if (time <= 0) FileData.removeCheckPlayer(player);
else FileData.setCheckPlayer(player, time);
if (time <= 0) Data.removeCheckPlayer(player);
else Data.setCheckPlayer(player, time);
if (player.getVehicle() != null) {
Entity entity = player.getVehicle();
@ -46,10 +46,22 @@ public class LoopManager {
// check if the player is still allowed to sit
Logic.checkSittingValidity(player);
// remove the player from the check
FileData.removeCheckPlayer(player);
Data.removeCheckPlayer(player);
}
}
}
HashMap<ServerPlayerEntity, DisplayEntity.TextDisplayEntity> spawnList = Data.getSpawnList();
for (ServerPlayerEntity player : spawnList.keySet()) {
DisplayEntity.TextDisplayEntity sitEntity = spawnList.get(player);
player.getServerWorld().spawnEntity(sitEntity);
player.startRiding(sitEntity);
// add the entity to the list
FileData.addSitEntity(player, sitEntity);
// remove the entity from the list
Data.removeSpawnList(player);
}
}
}
}