Skip to content

Commit abb9bfc

Browse files
committed
fix
1 parent a378e47 commit abb9bfc

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

src/main/java/re/imc/geysermodelengine/model/EntityTask.java

+5-15
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,8 @@ public void runAsync() {
7777

7878

7979
if (tick % 5 == 0) {
80-
81-
checkViewers(viewers);
82-
8380
if (tick % 40 == 0) {
84-
8581
for (Player viewer : Set.copyOf(viewers)) {
86-
8782
if (!canSee(viewer, model.getEntity())) {
8883
viewers.remove(viewer);
8984
}
@@ -135,17 +130,12 @@ public void checkViewers(Set<Player> viewers) {
135130

136131
private void sendSpawnPacket(Player onlinePlayer) {
137132
EntityTask task = model.getTask();
138-
int delay = 50;
139133
boolean firstJoined = GeyserModelEngine.getInstance().getJoinedPlayer().getIfPresent(onlinePlayer) != null;
134+
140135
if (firstJoined) {
141-
delay = GeyserModelEngine.getInstance().getJoinSendDelay();
142-
}
143-
if (task == null || firstJoined) {
144-
GeyserModelEngine.getInstance().getScheduler().schedule(() -> {
145-
model.getTask().sendEntityData(onlinePlayer, 1);
146-
}, delay, TimeUnit.MILLISECONDS);
136+
task.sendEntityData(onlinePlayer, GeyserModelEngine.getInstance().getJoinSendDelay() / 50);
147137
} else {
148-
task.sendEntityData(onlinePlayer, 1);
138+
task.sendEntityData(onlinePlayer, 2);
149139
}
150140
}
151141

@@ -195,7 +185,7 @@ public void sendColor(Collection<Player> players, boolean firstSend) {
195185
}
196186

197187

198-
public void updateEntityProperties(Collection<Player> players, boolean ignore, String... forceAnims) {
188+
public void updateEntityProperties(Collection<Player> players, boolean firstSend, String... forceAnims) {
199189
int entity = model.getEntity().getEntityId();
200190
Set<String> forceAnimSet = Set.of(forceAnims);
201191

@@ -266,7 +256,7 @@ public void updateEntityProperties(Collection<Player> players, boolean ignore, S
266256
intUpdates.put("modelengine:anim" + i, integer);
267257
i++;
268258
}
269-
if (!ignore) {
259+
if (!firstSend) {
270260
if (intUpdates.equals(lastIntSet)) {
271261
return;
272262
} else {

0 commit comments

Comments
 (0)