Skip to content

Fixed tpll not working #27

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
MineFact merged 3 commits into from
Mar 9, 2024
Merged

Fixed tpll not working #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09d0629
Fixed tpll not working
kyanvde Mar 8, 2024
b3e5e07
Update TpllComponent.java
MineFact Mar 8, 2024
b4bb06e
Merge branch 'master' into tpll-fixes
MineFact Mar 9, 2024
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
2 changes: 1 addition & 1 deletion ...net/buildtheearth/modules/common/components/pluginmessaging/PluginMessagingComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void onPluginMessageReceived(String channel, Player player, byte[] messag
}

// Add a new universal tpll target to the queue
if (subChannel.equals("Tpll")) {
if (subChannel.equals("TPLL")) {
NavigationModule.getInstance().getTpllComponent().addTpllToQueue(in, player);
}

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/net/buildtheearth/modules/navigation/components/tpll/TpllComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,13 @@ public void tpllPlayer(Player player, double[] coordinates, String targetServerN
ChatHelper.logDebug("Starting universal tpll teleportation for %s to %s.", player.getDisplayName(), targetServerName);
// Send a plugin message to the target server which adds the tpll to the queue
ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF("Tpll");
out.writeUTF("TPLL");
out.writeUTF(targetServerName);
out.writeUTF(String.valueOf(coordinates[0]));
out.writeUTF(String.valueOf(coordinates[1]));
out.writeUTF(player.getUniqueId().toString());
out.writeUTF(String.valueOf(coordinates[0]) + coordinates[1]));
player.sendPluginMessage(BuildTeamTools.getInstance(), "buildteamtools:buildteam", out.toByteArray());

// Switch the player to the target server
NetworkModule.getInstance().switchServer(player, targetServerName);
ChatHelper.logDebug("Teleported player to the target server.");
}

Expand Down
7 changes: 5 additions & 2 deletions ...ain/java/net/buildtheearth/modules/navigation/components/tpll/listeners/TpllListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ public void onTpll(PlayerCommandPreprocessEvent event) {
*/
private boolean isTpllCommand(PlayerCommandPreprocessEvent event) {
// Check if the command starts with "tpll"
if (!event.getMessage().startsWith("tpll")) return false;
ChatHelper.logDebug(event.getMessage());
if (!event.getMessage().startsWith("/tpll")) return false;
ChatHelper.logDebug("Intercepted tpll command.");

// Split the command to extract coordinates
String[] splitMessage = event.getMessage().split(" ");
splitMessage[1] = splitMessage[1].replaceAll(",", " ").trim();
if (splitMessage.length < 3) return false;
ChatHelper.logDebug("Command had the correct length (%s).", splitMessage.length);

Expand All @@ -85,7 +87,8 @@ private CompletableFuture<Boolean> shouldIntercept(PlayerCommandPreprocessEvent

if (!networkModule.getBuildTeam().isConnected() || !region.isConnected()) {
event.getPlayer().sendMessage(ChatHelper.error("Either this server or the receiving server isn't connected to the network."));
return CompletableFuture.completedFuture(true);
event.setCancelled(true);
return CompletableFuture.completedFuture(false);
}

if (region.getBuildTeam().getID() != networkModule.getBuildTeam().getID()) {
Expand Down