Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2025-01-23 21:52:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bed interactions kicking players, fixes #787

Browse Source
This commit is contained in:
libraryaddict 2024-12-10 13:00:49 +13:00
parent b692fa52cf
commit 3c99810f38
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java
View File

@ -10,9 +10,10 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.LibsPremium; import me.libraryaddict.disguise.utilities.LibsPremium;
import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerAnimationCollect;
import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerAttachEntity; import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerAttachEntity;
import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerAttributes; import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerAttributes;
import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerCollectItem;
import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerEntityAnimation;
import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerEntityStatus; import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerEntityStatus;
import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerEquipment; import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerEquipment;
import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerHeadLook; import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerHeadLook;
@ -40,8 +41,9 @@ public class PacketsHandler {
List<IPacketHandler> packetHandlers = new ArrayList<>(); List<IPacketHandler> packetHandlers = new ArrayList<>();
packetHandlers.add(new PacketHandlerAttributes()); packetHandlers.add(new PacketHandlerAttributes());
packetHandlers.add(new PacketHandlerAnimationCollect()); packetHandlers.add(new PacketHandlerCollectItem());
packetHandlers.add(new PacketHandlerEntityStatus()); packetHandlers.add(new PacketHandlerEntityStatus());
packetHandlers.add(new PacketHandlerEntityAnimation());
if (DisguiseConfig.isEquipmentPacketsEnabled()) { if (DisguiseConfig.isEquipmentPacketsEnabled()) {
packetHandlers.add(new PacketHandlerEquipment()); packetHandlers.add(new PacketHandlerEquipment());

4
plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAnimationCollect.java → plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerCollectItem.java
View File

@ -8,10 +8,10 @@ import me.libraryaddict.disguise.utilities.packets.LibsPackets;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class PacketHandlerAnimationCollect implements IPacketHandler { public class PacketHandlerCollectItem implements IPacketHandler {
@Override @Override
public PacketTypeCommon[] getHandledPackets() { public PacketTypeCommon[] getHandledPackets() {
return new PacketTypeCommon[]{PacketType.Play.Server.COLLECT_ITEM, PacketType.Play.Server.ENTITY_ANIMATION}; return new PacketTypeCommon[]{PacketType.Play.Server.COLLECT_ITEM};
} }
@Override @Override

38
plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEntityAnimation.java Normal file
View File

@ -0,0 +1,38 @@
package me.libraryaddict.disguise.utilities.packets.packethandlers;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityAnimation;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.utilities.packets.IPacketHandler;
import me.libraryaddict.disguise.utilities.packets.LibsPackets;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
public class PacketHandlerEntityAnimation implements IPacketHandler<WrapperPlayServerEntityAnimation> {
@Override
public PacketTypeCommon[] getHandledPackets() {
return new PacketTypeCommon[]{PacketType.Play.Server.ENTITY_ANIMATION};
}
@Override
public void handle(Disguise disguise, LibsPackets<WrapperPlayServerEntityAnimation> packets, Player observer, Entity entity) {
// All misc disguises cannot have animation events
if (disguise.isMiscDisguise()) {
packets.clear();
return;
}
// If this animation isn't a wake up, then don't need to handle
if (packets.getOriginalPacket().getType() != WrapperPlayServerEntityAnimation.EntityAnimationType.WAKE_UP) {
return;
}
// Player disguises can play the animation
if (disguise.isPlayerDisguise()) {
return;
}
packets.clear();
}
}