MineNet/Minigames
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fixed invisible players for joining players by sending custom packets

Browse Source
This commit is contained in:
Elias Müller
2023-11-26 18:19:03 +01:00
parent 440d4f1b48
commit 8b47eb1139
8 changed files with 83 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/eu/mhsl/minenet/minigames/handler/global/AddEntityToInstanceEventListener.java
View File

@ -1,10 +1,7 @@
package eu.mhsl.minenet.minigames.handler.global;
import eu.mhsl.minenet.minigames.message.type.ActionBarMessage;
import eu.mhsl.minenet.minigames.message.type.ChatMessage;
import eu.mhsl.minenet.minigames.message.Icon;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import eu.mhsl.minenet.minigames.instance.Spawnable;
import eu.mhsl.minenet.minigames.util.PacketUtil;
import net.minestom.server.MinecraftServer;
import net.minestom.server.entity.Player;
import net.minestom.server.event.EventListener;
@ -25,6 +22,12 @@ public class AddEntityToInstanceEventListener implements EventListener<AddEntity
if(event.getEntity() instanceof Player p) {
MinecraftServer.getSchedulerManager().scheduleNextTick(p::refreshCommands, ExecutionType.ASYNC);
if(event.getInstance() instanceof Spawnable instance) {
p.setRespawnPoint(instance.getSpawn());
}
PacketUtil.resendPlayerList(p);
p.addEffect(new Potion(PotionEffect.BLINDNESS, (byte) 1, 20)); //TODO Uncomment, currently buggy causes disconnect see https://github.com/Minestom/Minestom/discussions/1302
}

36
src/main/java/eu/mhsl/minenet/minigames/handler/global/PlayerLoginHandler.java
View File

@ -2,12 +2,12 @@ package eu.mhsl.minenet.minigames.handler.global;
import eu.mhsl.minenet.minigames.Main;
import eu.mhsl.minenet.minigames.api.QueuedPlayerRooms;
import eu.mhsl.minenet.minigames.instance.MineNetInstance;
import eu.mhsl.minenet.minigames.instance.room.Room;
import eu.mhsl.minenet.minigames.instance.transfer.Transfer;
import eu.mhsl.minenet.minigames.message.Icon;
import eu.mhsl.minenet.minigames.message.type.ChatMessage;
import eu.mhsl.minenet.minigames.skin.SkinCache;
import eu.mhsl.minenet.minigames.util.MoveInstance;
import net.minestom.server.MinecraftServer;
import net.minestom.server.entity.Player;
import net.minestom.server.event.EventListener;
@ -32,23 +32,25 @@ public class PlayerLoginHandler implements EventListener<PlayerLoginEvent> {
public @NotNull Result run(@NotNull PlayerLoginEvent event) {
Player p = event.getPlayer();
UUID pushQueue = QueuedPlayerRooms.pullQueue(event.getPlayer().getUuid());
if(pushQueue != null) {
Room target = Room.getRoom(pushQueue).orElseThrow();
Transfer transferInstance = new Transfer();
p.setRespawnPoint(transferInstance.getSpawn());
event.setSpawningInstance(transferInstance);
MinecraftServer.getSchedulerManager().scheduleTask(
() -> Room.setRoom(p, target),
TaskSchedule.seconds(1),
TaskSchedule.stop()
);
} else {
p.setRespawnPoint(Hub.INSTANCE.getSpawn());
event.setSpawningInstance(Hub.INSTANCE);
}
Transfer transferInstance = new Transfer();
p.setRespawnPoint(transferInstance.getSpawn());
event.setSpawningInstance(transferInstance);
// SkinCache.applySkin(p);
UUID pushQueue = QueuedPlayerRooms.pullQueue(event.getPlayer().getUuid());
MinecraftServer.getSchedulerManager().scheduleTask(
() -> {
if(pushQueue != null) {
Room.setRoom(p, Room.getRoom(pushQueue).orElseThrow());
} else {
MoveInstance.move(p, Hub.INSTANCE);
}
},
TaskSchedule.seconds(5),
TaskSchedule.stop()
);
SkinCache.applySkin(p);
try {
if(Objects.requireNonNull(Main.globalConfig.node("admins").getList(String.class)).stream().anyMatch(s -> s.equalsIgnoreCase(p.getUsername()))) {