Skip to content
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

Add option to make user return to spawn when dies #540

Merged
merged 4 commits into from
Dec 30, 2023
Merged

Add option to make user return to spawn when dies #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddfeb77
feat: user return to spawn when dies
Yuhtin Dec 20, 2023
86135ba
feat: add return to spawn in config docs
Yuhtin Dec 28, 2023
a5b5b7a
feat: improve respawn feature variable name
Yuhtin Dec 28, 2023
092731a
Merge branch 'WiIIiam278:master' into respawn-feature
Yuhtin Dec 29, 2023
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
7 changes: 7 additions & 0 deletions common/src/main/java/net/william278/huskhomes/config/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@ public class Settings {
@YamlKey("general.description_regex")
private String descriptionRegex = "\\A\\p{ASCII}*\\z";

@YamlComment("Whether the user should back to spawn when they die")
@YamlKey("general.always_respawn_at_spawn")
private boolean alwaysRespawnAtSpawn = false;

// Back command settings
@YamlComment("Whether /back should work to teleport the user to where they died")
Expand Down Expand Up @@ -439,6 +442,10 @@ public String getDescriptionRegex() {
return descriptionRegex;
}

public boolean doAlwaysRespawnAtSpawn() {
return alwaysRespawnAtSpawn;
}

public boolean doBackCommandReturnByDeath() {
return backCommandReturnByDeath;
}
Expand Down
4 changes: 3 additions & 1 deletion common/src/main/java/net/william278/huskhomes/listener/EventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,9 @@ protected final void handlePlayerTeleport(@NotNull OnlineUser onlineUser, @NotNu
* @param position the new spawn point
*/
protected final void handlePlayerUpdateSpawnPoint(@NotNull OnlineUser onlineUser, @NotNull Position position) {
if (plugin.getSettings().doCrossServer() && plugin.getSettings().isGlobalRespawning()) {
if (!plugin.getSettings().doAlwaysRespawnAtSpawn()
&& plugin.getSettings().doCrossServer()
&& plugin.getSettings().isGlobalRespawning()) {
plugin.getDatabase().setRespawnPosition(onlineUser, position);
}
}
Expand Down
4 changes: 3 additions & 1 deletion docs/Config-Files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ general:
back_command_return_by_death: true
# Whether /back should work with other plugins that use the PlayerTeleportEvent (can cause conflicts)
back_command_save_teleport_event: false
# Whether the user should back to spawn when they die (ensure that cross_server.enabled and cross_server.global_respawning are enabled)
always_respawn_at_spawn: true
# How many items should be displayed per-page in chat menu lists
list_items_per_page: 12
# Whether teleportation should be carried out asynchronously (ensuring chunks load before teleporting)
Expand Down Expand Up @@ -193,4 +195,4 @@ This file is only present if your server uses cross-server mode to run HuskHomes
name: beta
```

</details>
</details>