mirrors/Havana
1
Fork 0
mirror of https://github.com/Quackster/Havana.git synced 2025-07-03 05:07:46 +00:00
Code Activity

Cancel teleportation when moving between rooms by using navigator

Browse source
This commit is contained in:
Quackster 2024-02-10 13:17:21 +10:00
parent f25f446232
commit 2ccae8c7ef
5 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Havana-Server/src/main/java/org/alexdev/havana/game/item/interactors/types/TeleportInteractor.java
View file

@ -67,7 +67,9 @@ public class TeleportInteractor extends GenericTrigger {
var resolved = ItemManager.getInstance().resolveItem(pairId);
Item pairedTeleporter = resolved != null ? resolved : targetTeleporter;
roomUser.setAuthenticateTelporterId(pairedTeleporter.getDatabaseId());
roomUser.setAuthenticateTelporterRoomId(pairedTeleporter.getRoomId());
// Check if the user is inside the teleporter, if so, walk out. Useful if the user is stuck inside.
if (item.getPosition().equals(roomUser.getPosition()) && !RoomTile.isValidTile(room, player, item.getPosition().getSquareInFront())) {
@ -124,6 +126,7 @@ public class TeleportInteractor extends GenericTrigger {
}
roomUser.setAuthenticateTelporterId(-1);
roomUser.setAuthenticateTelporterRoomId(-1);
pairedTeleporter.setCustomData(TELEPORTER_CLOSE);
pairedTeleporter.updateStatus();
@ -169,6 +172,7 @@ public class TeleportInteractor extends GenericTrigger {
GameScheduler.getInstance().getService().schedule(() -> {
if (roomUser.getRoom().getId() != room.getId()) {
roomUser.setAuthenticateTelporterId(-1);
roomUser.setAuthenticateTelporterRoomId(-1);
return;
}
/*if (roomUser.getAuthenticateTelporterId() == -1) {
@ -186,6 +190,7 @@ public class TeleportInteractor extends GenericTrigger {
GameScheduler.getInstance().getService().schedule(() -> {
if (roomUser.getRoom().getId() != room.getId()) {
roomUser.setAuthenticateTelporterId(-1);
roomUser.setAuthenticateTelporterRoomId(-1);
return;
}
/*if (roomUser.getAuthenticateTelporterId() == -1) {
@ -193,6 +198,7 @@ public class TeleportInteractor extends GenericTrigger {
}*/
roomUser.setAuthenticateTelporterId(-1);
roomUser.setAuthenticateTelporterRoomId(-1);
if (pairedTeleporter.getRoomId() == item.getRoomId()) {
pairedTeleporter.setCustomData(TELEPORTER_CLOSE);

11
Havana-Server/src/main/java/org/alexdev/havana/game/room/entities/RoomPlayer.java
View file

@ -29,6 +29,7 @@ public class RoomPlayer extends RoomEntity {
private int authenticateId;
private long authenticateTelporterId;
private long authenticateTelporterRoomId;
private int observingGameId;
private boolean isTyping;
@ -60,6 +61,7 @@ public class RoomPlayer extends RoomEntity {
this.player = player;
this.authenticateId = -1;
this.authenticateTelporterId = -1;
this.authenticateTelporterRoomId = -1;
this.tradeItems = new CopyOnWriteArrayList<>();
}
@ -223,6 +225,7 @@ public class RoomPlayer extends RoomEntity {
// Remove authentications
this.authenticateId = -1;
this.authenticateTelporterId = -1;
this.authenticateTelporterRoomId = -1;
}
public void startObservingGame(int gameId) {
@ -409,4 +412,12 @@ public class RoomPlayer extends RoomEntity {
public void setLastLobbyRedirection(GameType lastLobbyRedirection) {
this.lastLobbyRedirection = lastLobbyRedirection;
}
public long getAuthenticateTelporterRoomId() {
return authenticateTelporterRoomId;
}
public void setAuthenticateTelporterRoomId(long authenticateTelporterRoomId) {
this.authenticateTelporterRoomId = authenticateTelporterRoomId;
}
}

1
Havana-Server/src/main/java/org/alexdev/havana/game/room/managers/RoomEntityManager.java
View file

@ -259,6 +259,7 @@ public class RoomEntityManager {
}
player.getRoomUser().setAuthenticateTelporterId(-1);
player.getRoomUser().setAuthenticateTelporterRoomId(-1);
}
GamePlayer gamePlayer = player.getRoomUser().getGamePlayer();

1
Havana-Server/src/main/java/org/alexdev/havana/game/room/mapping/RoomMapping.java
View file

@ -276,6 +276,7 @@ public class RoomMapping {
if (p.getRoomUser().getPosition().equals(oldPosition) ||
p.getRoomUser().getAuthenticateTelporterId() == item.getVirtualId()) {
p.getRoomUser().setAuthenticateTelporterId(-1);
p.getRoomUser().setAuthenticateTelporterRoomId(-1);
p.getRoomUser().setWalkingAllowed(true);
}
}

6
Havana-Server/src/main/java/org/alexdev/havana/messages/incoming/rooms/TRYFLAT.java
View file

@ -77,6 +77,12 @@ public class TRYFLAT implements MessageEvent {
}
}
// User switched rooms, cancel teleportation
if (player.getRoomUser().getAuthenticateTelporterRoomId() != roomId) {
player.getRoomUser().setAuthenticateTelporterId(-1);
player.getRoomUser().setAuthenticateTelporterRoomId(-1);
}
player.getRoomUser().setAuthenticateId(roomId);
player.send(new FLAT_LETIN());
}