Skip to content

Commit a70817f

Browse files
authored
Update to 1.19.3 (#59)
1 parent 11459e7 commit a70817f

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
}
2121

2222
dependencies {
23-
implementation("com.github.Minestom:Minestom:e0427a36f3")
23+
implementation("com.github.Minestom:Minestom:cb3892255e")
2424
implementation("de.articdive:jnoise-pipeline:4.0.0")
2525
implementation("io.prometheus:simpleclient:0.16.0")
2626
implementation("io.prometheus:simpleclient_hotspot:0.16.0")

src/main/java/net/minestom/arena/lobby/NPC.java

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import net.kyori.adventure.text.event.ClickEvent;
99
import net.minestom.arena.Messenger;
1010
import net.minestom.arena.game.ArenaCommand;
11-
import net.minestom.server.MinecraftServer;
1211
import net.minestom.server.coordinate.Point;
1312
import net.minestom.server.coordinate.Pos;
1413
import net.minestom.server.entity.*;
@@ -18,22 +17,15 @@
1817
import net.minestom.server.event.entity.EntityAttackEvent;
1918
import net.minestom.server.event.player.PlayerEntityInteractEvent;
2019
import net.minestom.server.instance.Instance;
21-
import net.minestom.server.network.packet.server.play.PlayerInfoPacket;
22-
import net.minestom.server.network.packet.server.play.PlayerInfoPacket.AddPlayer.Property;
23-
import net.minestom.server.network.packet.server.play.PlayerInfoPacket.RemovePlayer;
20+
import net.minestom.server.network.packet.server.play.PlayerInfoUpdatePacket;
2421
import net.minestom.server.sound.SoundEvent;
25-
import net.minestom.server.timer.TaskSchedule;
2622
import org.jetbrains.annotations.NotNull;
2723

2824
import java.io.IOException;
2925
import java.util.HashMap;
3026
import java.util.List;
3127
import java.util.function.Consumer;
3228

33-
import static net.minestom.server.network.packet.server.play.PlayerInfoPacket.Action.ADD_PLAYER;
34-
import static net.minestom.server.network.packet.server.play.PlayerInfoPacket.Action.REMOVE_PLAYER;
35-
import static net.minestom.server.network.packet.server.play.PlayerInfoPacket.AddPlayer;
36-
3729
// https://gist.github.com/iam4722202468/36630043ca89e786bb6318e296f822f8
3830
final class NPC extends EntityCreature {
3931
private final String name;
@@ -92,14 +84,15 @@ public void handle(@NotNull PlayerEntityInteractEvent event) {
9284
@Override
9385
public void updateNewViewer(@NotNull Player player) {
9486
// Required to spawn player
95-
final List<Property> properties = List.of(new Property("textures", skin.textures(), skin.signature()));
96-
player.sendPacket(new PlayerInfoPacket(ADD_PLAYER, new AddPlayer(getUuid(), name, properties,
97-
GameMode.SURVIVAL, 0, null, null)));
98-
99-
// Remove from tab list after 1 second, seems not to load skin if 1 or 2 ticks
100-
MinecraftServer.getSchedulerManager().scheduleTask(
101-
() -> player.sendPacket(new PlayerInfoPacket(REMOVE_PLAYER, new RemovePlayer(getUuid()))),
102-
TaskSchedule.seconds(1), TaskSchedule.stop());
87+
final List<PlayerInfoUpdatePacket.Property> properties = List.of(
88+
new PlayerInfoUpdatePacket.Property("textures", skin.textures(), skin.signature())
89+
);
90+
player.sendPacket(new PlayerInfoUpdatePacket(PlayerInfoUpdatePacket.Action.ADD_PLAYER,
91+
new PlayerInfoUpdatePacket.Entry(
92+
getUuid(), name, properties, false, 0, GameMode.SURVIVAL, null,
93+
null)
94+
)
95+
);
10396

10497
super.updateNewViewer(player);
10598
}

0 commit comments

Comments
 (0)