Skip to content

fix: correct player spawn in 1.20.1- #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tofaa2 merged 2 commits into from
Jul 7, 2025
Merged

fix: correct player spawn in 1.20.1- #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8478e87
fix: correct player spawn in 1.20.1-
huanmeng-qwq Jul 7, 2025
8bc8bfb
feat: Add rotation packet handling after player spawn.
huanmeng-qwq Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,7 @@ public boolean spawn(Location location, EntityContainer parent) {
this.spawned = true;

sendPacketsToViewers(
new WrapperPlayServerSpawnEntity(
entityId,
Optional.of(this.uuid),
entityType,
location.getPosition(),
location.getPitch(),
location.getYaw(),
location.getYaw(),
getObjectData(),
createVeloPacket()
),
createSpawnPacket(),
entityMeta.createPacket()
);

Expand Down Expand Up @@ -238,7 +228,7 @@ public void sendActionbarToViewers(Component message) {
sendPacketToViewers(new WrapperPlayServerSystemChatMessage(true, message));
}

protected WrapperPlayServerSpawnEntity createSpawnPacket() {
protected PacketWrapper<?> createSpawnPacket() {
return new WrapperPlayServerSpawnEntity(
entityId,
Optional.of(this.uuid),
Expand Down
41 changes: 35 additions & 6 deletions api/src/main/java/me/tofaa/entitylib/wrapper/WrapperPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
package me.tofaa.entitylib.wrapper;

import com.github.retrooper.packetevents.manager.server.ServerVersion;
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
import com.github.retrooper.packetevents.protocol.player.*;
import com.github.retrooper.packetevents.protocol.world.Location;
import com.github.retrooper.packetevents.util.Vector3d;
import com.github.retrooper.packetevents.protocol.player.GameMode;
import com.github.retrooper.packetevents.protocol.player.TextureProperty;
import com.github.retrooper.packetevents.protocol.player.UserProfile;
import com.github.retrooper.packetevents.wrapper.PacketWrapper;
import com.github.retrooper.packetevents.wrapper.play.server.*;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerDestroyEntities;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityHeadLook;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityRotation;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoRemove;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoUpdate;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSpawnPlayer;
import me.tofaa.entitylib.EntityLib;
import me.tofaa.entitylib.meta.EntityMeta;
import java.util.EnumSet;
import java.util.List;
import java.util.UUID;
import net.kyori.adventure.text.Component;

import java.util.*;
import org.jetbrains.annotations.NotNull;

public class WrapperPlayer extends WrapperLivingEntity {

Expand All @@ -25,6 +33,27 @@ public WrapperPlayer(UserProfile profile, int entityId) {
this.profile = profile;
}

@Override
protected PacketWrapper<?> createSpawnPacket() {
if (EntityLib.getApi().getPacketEvents().getServerManager().getVersion().isOlderThanOrEquals(ServerVersion.V_1_20_1)) {
return new WrapperPlayServerSpawnPlayer(
getEntityId(),
profile.getUUID(),
getLocation(),
getEntityMeta().entityData()
);
}
return super.createSpawnPacket();
}

@Override
public @NotNull List<PacketWrapper<?>> createSpawnPackets() {
final List<PacketWrapper<?>> packets = super.createSpawnPackets();
packets.add(new WrapperPlayServerEntityRotation(getEntityId(), getYaw(), getPitch(), isOnGround()));
packets.add(new WrapperPlayServerEntityHeadLook(getEntityId(), getYaw()));
return packets;
}

public WrapperPlayServerPlayerInfoUpdate tabListPacket() {
EnumSet<WrapperPlayServerPlayerInfoUpdate.Action> actions = EnumSet.of(
WrapperPlayServerPlayerInfoUpdate.Action.ADD_PLAYER,
Expand Down