firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[FEAT] Add a way for login/logout event to know if it was sent from vanish

Browse Source
This commit is contained in:
HypherionSA
2024-07-05 20:49:37 +02:00
parent 55e7e2211b
commit 0f17e8f844
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterPlayerEvent.java
View File

@@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter;
@RequiredArgsConstructor @RequiredArgsConstructor
@Getter @Getter
@@ -11,18 +12,32 @@ public class CraterPlayerEvent extends CraterEvent {
private final BridgedPlayer player; private final BridgedPlayer player;
@Getter
public static class PlayerLoggedIn extends CraterPlayerEvent { public static class PlayerLoggedIn extends CraterPlayerEvent {
private final boolean isFromVanish;
public PlayerLoggedIn(BridgedPlayer player) { public PlayerLoggedIn(BridgedPlayer player) {
this(player, false);
}
public PlayerLoggedIn(BridgedPlayer player, boolean isFromVanish) {
super(player); super(player);
this.isFromVanish = false;
} }
} }
@Getter @Setter
public static class PlayerLoggedOut extends CraterPlayerEvent { public static class PlayerLoggedOut extends CraterPlayerEvent {
private final boolean isFromVanish;
public PlayerLoggedOut(BridgedPlayer player) { public PlayerLoggedOut(BridgedPlayer player) {
this(player, false);
}
public PlayerLoggedOut(BridgedPlayer player, boolean isFromVanish) {
super(player); super(player);
this.isFromVanish = false;
} }
} }

4
Fabric/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java
View File

@@ -12,9 +12,9 @@ public class Vanish {
public static void register() { public static void register() {
VanishEvents.VANISH_EVENT.register((serverPlayer, b) -> { VanishEvents.VANISH_EVENT.register((serverPlayer, b) -> {
if (b) { if (b) {
CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(serverPlayer))); CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(serverPlayer), true));
} else { } else {
CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(serverPlayer))); CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(serverPlayer), true));
} }
}); });
} }

4
NeoForge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java
View File

@@ -15,9 +15,9 @@ public class Vanish {
@SubscribeEvent @SubscribeEvent
public void vanishevent(PlayerVanishEvent event) { public void vanishevent(PlayerVanishEvent event) {
if (event.isVanished()) { if (event.isVanished()) {
CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(event.getEntity()))); CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(event.getEntity()), true));
} else { } else {
CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(event.getEntity()))); CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(event.getEntity()), true));
} }
} }