Skip to content

fix: not getting teleported back when falling into the void #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ItzKatze merged 1 commit into from
Jan 9, 2026
Merged

fix: not getting teleported back when falling into the void #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/TypeBedWarsLobbyLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
public class TypeBedWarsLobbyLoader implements LobbyTypeLoader {
public static BedWarsLobbyMap bedWarsLobbyMap = new BedWarsLobbyMap();
public static LobbyParkourManager parkourManager;
private final Pos spawnPoint = new Pos(-39.5, 72, 0, -90, 0);

@Getter
private final LobbyItemHandler itemHandler = new LobbyItemHandler();
Expand Down Expand Up @@ -149,7 +150,7 @@ public List<TablistModule> getModules() {
@Override
public LoaderValues getLoaderValues() {
return new LoaderValues(
(type) -> new Pos(-39.5, 72, 0, -90, 0),
(type) -> spawnPoint,
false
);
}
Expand All @@ -166,6 +167,7 @@ public List<HypixelEventClass> getTraditionalEvents() {
events.add(new LobbyLaunchPadEvents());
events.add(new LobbyPlayerJoinEvents());
events.add(new LobbyBlockBreak());
events.add(new LobbyPlayerMove(spawnPoint));
return events;
}

Expand Down
17 changes: 9 additions & 8 deletions type.lobby/src/main/java/net/swofty/type/lobby/events/LobbyPlayerMove.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
package net.swofty.type.lobby.events;

import net.minestom.server.coordinate.Pos;
import net.minestom.server.entity.Player;
import net.minestom.server.event.player.PlayerMoveEvent;
import net.swofty.type.generic.event.EventNodes;
import net.swofty.type.generic.event.HypixelEvent;
import net.swofty.type.generic.event.HypixelEventClass;

public class LobbyPlayerMove implements HypixelEventClass {
private final Pos spawnPoint;

public LobbyPlayerMove(Pos spawnPoint) {
this.spawnPoint = spawnPoint;
}

@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
public void onPlayerMove(PlayerMoveEvent event) {
Player player = event.getPlayer();
if (player.getPosition().y() < -60) {
teleportToSpawn(player);
if (player.getPosition().y() < 0) {
player.teleport(spawnPoint);
player.sendMessage("§cYou are not allowed to leave this area!");
}
}

private void teleportToSpawn(Player player) {
player.respawn();
player.sendMessage("§cYou are not allowed to leave this area!");
}

}
10 changes: 4 additions & 6 deletions ...ylobby/src/main/java/net/swofty/type/murdermysterylobby/TypeMurderMysteryLobbyLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import net.swofty.type.generic.data.handlers.MurderMysteryDataHandler;
import net.swofty.type.generic.command.HypixelCommand;
import net.swofty.type.generic.entity.hologram.PlayerHolograms;
import net.swofty.type.lobby.events.*;
import net.swofty.type.murdermysterylobby.hologram.LeaderboardHologramManager;
import net.swofty.type.generic.entity.npc.HypixelNPC;
import net.swofty.type.generic.event.HypixelEventClass;
Expand All @@ -23,18 +24,13 @@
import net.swofty.type.murdermysterylobby.tab.MurderMysteryPlayersOnlineModule;
import net.swofty.type.murdermysterylobby.util.MurderMysteryLobbyMap;
import net.swofty.type.lobby.LobbyTypeLoader;
import net.swofty.type.lobby.events.LobbyBlockBreak;
import net.swofty.type.lobby.events.LobbyItemEvents;
import net.swofty.type.lobby.events.LobbyLaunchPadEvents;
import net.swofty.type.lobby.events.LobbyPlayerJoinEvents;
import net.swofty.type.lobby.item.LobbyItem;
import net.swofty.type.lobby.item.LobbyItemHandler;
import net.swofty.type.lobby.item.impl.HidePlayers;
import net.swofty.type.lobby.item.impl.LobbySelector;
import net.swofty.type.lobby.item.impl.PlayCompass;
import net.swofty.type.lobby.item.impl.ProfileItem;
import net.swofty.type.lobby.launchpad.LaunchPad;
import net.swofty.type.lobby.events.LobbyParkourEvents;
import net.swofty.type.lobby.parkour.LobbyParkourManager;
import net.swofty.type.lobby.parkour.Parkour;
import net.swofty.type.murdermysterylobby.parkour.MurderMysteryLobbyParkour;
Expand All @@ -47,6 +43,7 @@

public class TypeMurderMysteryLobbyLoader implements LobbyTypeLoader {
public static MurderMysteryLobbyMap lobbyMap = new MurderMysteryLobbyMap();
private final Pos spawnPoint = new Pos(1.5, 72, 0.5, -90, 0);

@Getter
private final LobbyItemHandler itemHandler = new LobbyItemHandler();
Expand Down Expand Up @@ -132,7 +129,7 @@ public List<TablistModule> getModules() {
@Override
public LoaderValues getLoaderValues() {
return new LoaderValues(
(type) -> new Pos(1.5, 72, 0.5, -90, 0),
(type) -> spawnPoint,
false
);
}
Expand All @@ -149,6 +146,7 @@ public List<HypixelEventClass> getTraditionalEvents() {
events.add(new LobbyPlayerJoinEvents());
events.add(new LobbyBlockBreak());
events.add(new LobbyParkourEvents());
events.add(new LobbyPlayerMove(spawnPoint));
return events;
}

Expand Down
9 changes: 4 additions & 5 deletions ...prototypelobby/src/main/java/net/swofty/type/prototypelobby/TypePrototypeLobbyLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
import net.swofty.type.generic.tab.TablistManager;
import net.swofty.type.generic.tab.TablistModule;
import net.swofty.type.lobby.LobbyTypeLoader;
import net.swofty.type.lobby.events.LobbyBlockBreak;
import net.swofty.type.lobby.events.LobbyItemEvents;
import net.swofty.type.lobby.events.LobbyParkourEvents;
import net.swofty.type.lobby.events.LobbyPlayerJoinEvents;
import net.swofty.type.lobby.events.*;
import net.swofty.type.lobby.item.LobbyItem;
import net.swofty.type.lobby.item.LobbyItemHandler;
import net.swofty.type.lobby.item.impl.HidePlayers;
Expand All @@ -41,6 +38,7 @@
public class TypePrototypeLobbyLoader implements LobbyTypeLoader {
private static final LobbyItemHandler itemHandler = new LobbyItemHandler();
public static LobbyParkourManager parkourManager;
private final Pos spawnPoint = new Pos(11.5, 76, 0.5, 90, 0);

@Override
public ServerType getType() {
Expand Down Expand Up @@ -119,7 +117,7 @@ public List<TablistModule> getModules() {
@Override
public LoaderValues getLoaderValues() {
return new LoaderValues(
(type) -> new Pos(11.5, 76, 0.5, 90, 0),
(type) -> spawnPoint,
false
);
}
Expand All @@ -135,6 +133,7 @@ public List<HypixelEventClass> getTraditionalEvents() {
events.add(new LobbyPlayerJoinEvents());
events.add(new LobbyParkourEvents());
events.add(new LobbyBlockBreak());
events.add(new LobbyPlayerMove(spawnPoint));
return events;
}

Expand Down
9 changes: 4 additions & 5 deletions type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/TypeSkywarsLobbyLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
import net.swofty.type.generic.tab.TablistManager;
import net.swofty.type.generic.tab.TablistModule;
import net.swofty.type.lobby.LobbyTypeLoader;
import net.swofty.type.lobby.events.LobbyBlockBreak;
import net.swofty.type.lobby.events.LobbyItemEvents;
import net.swofty.type.lobby.events.LobbyLaunchPadEvents;
import net.swofty.type.lobby.events.LobbyPlayerJoinEvents;
import net.swofty.type.lobby.events.*;
import net.swofty.type.lobby.item.LobbyItem;
import net.swofty.type.lobby.item.LobbyItemHandler;
import net.swofty.type.lobby.item.impl.HidePlayers;
Expand Down Expand Up @@ -56,6 +53,7 @@ public class TypeSkywarsLobbyLoader implements LobbyTypeLoader {
@Getter
private static LeaderboardHologramManager leaderboardManager;
private LobbyParkourManager parkourManager;
private final Pos spawnPont = new Pos(-3.5, 66, 0.5, -90, 0);

@Override
public ServerType getType() {
Expand Down Expand Up @@ -158,7 +156,7 @@ public List<TablistModule> getModules() {
@Override
public LoaderValues getLoaderValues() {
return new LoaderValues(
(type) -> new Pos(-3.5, 66, 0.5, -90, 0),
(type) -> spawnPont,
false
);
}
Expand All @@ -174,6 +172,7 @@ public List<HypixelEventClass> getTraditionalEvents() {
events.add(new LobbyLaunchPadEvents());
events.add(new LobbyPlayerJoinEvents());
events.add(new LobbyBlockBreak());
events.add(new LobbyPlayerMove(spawnPont));
return events;
}

Expand Down