Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-31 04:46:37 +00:00
Code Issues Releases Activity

fix(network): 修复使用via进服方块选取的问题

Browse Source
This commit is contained in:
jhqwqmc
2025-05-04 17:09:28 +08:00
parent 44a3cbd82d
commit 7b2b56e836
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
View File

@@ -36,6 +36,7 @@ import net.momirealms.craftengine.core.plugin.config.Config;
import net.momirealms.craftengine.core.plugin.network.ConnectionState;
import net.momirealms.craftengine.core.plugin.network.NetWorkUser;
import net.momirealms.craftengine.core.plugin.network.NetworkManager;
import net.momirealms.craftengine.core.plugin.network.ProtocolVersion;
import net.momirealms.craftengine.core.util.*;
import net.momirealms.craftengine.core.world.BlockHitResult;
import net.momirealms.craftengine.core.world.BlockPos;
@@ -1344,7 +1345,7 @@ public class PacketConsumers {
// When the hotbar is full, the latest creative mode inventory can only be accessed when the player opens the inventory screen. Currently, it is not worth further handling this issue.
public static final TriConsumer<NetWorkUser, NMSPacketEvent, Object> SET_CREATIVE_SLOT = (user, event, packet) -> {
try {
if (VersionHelper.isOrAbove1_21_4()) return;
if (ProtocolVersionUtils.isVersionNewerThan(user.protocolVersion(), ProtocolVersion.V1_21_4)) return;
if (!user.isOnline()) return;
BukkitServerPlayer player = (BukkitServerPlayer) user;
if (VersionHelper.isFolia()) {
@@ -1612,6 +1613,7 @@ public class PacketConsumers {
Byte displayType = container.get(displayTypeKey, PersistentDataType.BYTE);
if (customTrident == null) return;
Reflections.field$ClientboundAddEntityPacket$type.set(packet, Reflections.instance$EntityType$ITEM_DISPLAY);
// System.out.println(packet);
List<Object> itemDisplayValues = new ArrayList<>();
Item<ItemStack> item = BukkitItemManager.instance().createWrappedItem(Key.of(customTrident), null);
ItemDisplayEntityData.InterpolationDelay.addEntityDataIfNotDefaultValue(interpolationDelay, itemDisplayValues);
@@ -1637,12 +1639,11 @@ public class PacketConsumers {
public static final TriConsumer<NetWorkUser, NMSPacketEvent, Object> SYNC_ENTITY_POSITION = (user, event, packet) -> {
try {
int entityId = FastNMS.INSTANCE.method$ClientboundEntityPositionSyncPacket$id(packet);
// if (user.tridentView().contains(entityId)) {
// if (!VersionHelper.isOrAbove1_21_3()) return;
// Object values = Reflections.field$ClientboundEntityPositionSyncPacket$values.get(packet);
// user.sendPacket(Reflections.constructor$ClientboundTeleportEntityPacket.newInstance(entityId, values, Set.of(), false), true);
// Bukkit.getOnlinePlayers().forEach(player -> player.sendMessage("Sync entity position: " + values));
// }
if (user.tridentView().containsKey(entityId)) {
if (!VersionHelper.isOrAbove1_21_3()) return;
Object values = Reflections.field$ClientboundEntityPositionSyncPacket$values.get(packet);
// Bukkit.getOnlinePlayers().forEach(player -> player.sendMessage("Sync entity position: " + values));
}
if (BukkitFurnitureManager.instance().isFurnitureRealEntity(entityId)) {
event.setCancelled(true);
}

30
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
View File

@@ -6627,21 +6627,21 @@ public class Reflections {
)
);
// public static final Class<?> clazz$PositionMoveRotation =
// ReflectionUtils.getClazz(
// BukkitReflectionUtils.assembleMCClass("world.entity.PositionMoveRotation")
// );
//
// public static final Field field$ClientboundEntityPositionSyncPacket$values = Optional.ofNullable(clazz$ClientboundEntityPositionSyncPacket)
// .map(it -> ReflectionUtils.getInstanceDeclaredField(it, clazz$PositionMoveRotation, 0))
// .orElse(null);
//
// public static final Class<?> clazz$ClientboundTeleportEntityPacket = requireNonNull(
// BukkitReflectionUtils.findReobfOrMojmapClass(
// "network.protocol.game.PacketPlayOutEntityTeleport",
// "network.protocol.game.ClientboundTeleportEntityPacket"
// )
// );
public static final Class<?> clazz$PositionMoveRotation =
ReflectionUtils.getClazz(
BukkitReflectionUtils.assembleMCClass("world.entity.PositionMoveRotation")
);
public static final Field field$ClientboundEntityPositionSyncPacket$values = Optional.ofNullable(clazz$ClientboundEntityPositionSyncPacket)
.map(it -> ReflectionUtils.getInstanceDeclaredField(it, clazz$PositionMoveRotation, 0))
.orElse(null);
public static final Class<?> clazz$ClientboundTeleportEntityPacket = requireNonNull(
BukkitReflectionUtils.findReobfOrMojmapClass(
"network.protocol.game.PacketPlayOutEntityTeleport",
"network.protocol.game.ClientboundTeleportEntityPacket"
)
);
//
// /**
// * 实体移动数据包