diff --git a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/FakeplayerListener.java b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/FakeplayerListener.java index eaf9621..796347c 100644 --- a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/FakeplayerListener.java +++ b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/FakeplayerListener.java @@ -66,7 +66,7 @@ public class FakeplayerListener implements Listener { @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) public void onDead(@NotNull PlayerDeathEvent event) { var player = event.getPlayer(); - if (manager.notContains(player)) { + if (manager.isNotFake(player)) { return; } if (!config.isKickOnDead()) { @@ -88,7 +88,7 @@ public class FakeplayerListener implements Listener { @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) public void onQuit(@NotNull PlayerQuitEvent event) { var target = event.getPlayer(); - if (manager.notContains(target)) { + if (manager.isNotFake(target)) { return; } diff --git a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/PlayerListeners.java b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/PlayerListeners.java index 5e6f640..a5d95a7 100644 --- a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/PlayerListeners.java +++ b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/PlayerListeners.java @@ -31,7 +31,7 @@ public class PlayerListeners implements Listener { if (!(passenger instanceof Player target)) { continue; } - if (manager.contains(target)) { + if (manager.isFake(target)) { player.removePassenger(target); } } @@ -42,7 +42,7 @@ public class PlayerListeners implements Listener { */ @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) public void invsee(@NotNull PlayerInteractAtEntityEvent event) { - if (!(event.getRightClicked() instanceof Player target) || manager.notContains(target)) { + if (!(event.getRightClicked() instanceof Player target) || manager.isNotFake(target)) { return; } @@ -55,7 +55,7 @@ public class PlayerListeners implements Listener { @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) public void onDragInventory(@NotNull InventoryDragEvent event) { var top = event.getView().getTopInventory(); - if (top.getType() == InventoryType.PLAYER && top.getHolder() instanceof Player player && manager.contains(player)) { + if (top.getType() == InventoryType.PLAYER && top.getHolder() instanceof Player player && manager.isFake(player)) { if (event.getNewItems().keySet().stream().anyMatch(slot -> slot > 35)) { // > 35 表示从假人背包移动到玩家背包 event.setCancelled(true); } diff --git a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/FakeplayerManager.java b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/FakeplayerManager.java index ca110b5..59da6b1 100644 --- a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/FakeplayerManager.java +++ b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/FakeplayerManager.java @@ -312,7 +312,7 @@ public class FakeplayerManager { * @param target 玩家 * @return 是否是假人 */ - public boolean contains(@NotNull Player target) { + public boolean isFake(@NotNull Player target) { return this.playerList.getByUUID(target.getUniqueId()) != null; } @@ -322,7 +322,7 @@ public class FakeplayerManager { * @param target 玩家 * @return 是否不是假人 */ - public boolean notContains(@NotNull Player target) { + public boolean isNotFake(@NotNull Player target) { return this.playerList.getByUUID(target.getUniqueId()) == null; } @@ -385,7 +385,7 @@ public class FakeplayerManager { return; } - if (!this.contains(target)) { + if (!this.isFake(target)) { return; } @@ -434,7 +434,7 @@ public class FakeplayerManager { if (commands.isEmpty()) { return; } - if (this.notContains(target)) { + if (this.isNotFake(target)) { return; } @@ -458,7 +458,7 @@ public class FakeplayerManager { return; } - if (this.notContains(player)) { + if (this.isNotFake(player)) { return; } diff --git a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/WildFakeplayerManager.java b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/WildFakeplayerManager.java index 0e2e0a8..81d7f93 100644 --- a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/WildFakeplayerManager.java +++ b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/WildFakeplayerManager.java @@ -124,7 +124,7 @@ public class WildFakeplayerManager implements PluginMessageListener { .getServer() .getOnlinePlayers() .stream() - .filter(manager::notContains) + .filter(manager::isNotFake) .findAny() .orElse(null); diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeServerGamePacketListenerImpl.java index fb0ba33..387c58f 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeServerGamePacketListenerImpl.java @@ -4,7 +4,6 @@ import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; import io.github.hello09x.fakeplayer.core.Main; import io.github.hello09x.fakeplayer.core.manager.FakeplayerManager; import io.netty.buffer.Unpooled; -import lombok.extern.slf4j.Slf4j; import net.minecraft.network.Connection; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.protocol.Packet; @@ -56,7 +55,7 @@ public class FakeServerGamePacketListenerImpl extends ServerGamePacketListenerIm var recipient = Bukkit .getOnlinePlayers() .stream() - .filter(manager::notContains) + .filter(manager::isNotFake) .findAny() .orElse(null); if (recipient == null) {