Skip to content

Commit 187e316

Browse files
committed
📝 fixs
1 parent 07c08a3 commit 187e316

4 files changed

Lines changed: 13 additions & 10 deletions

File tree

changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
# Unreleased
88

9+
- Fixed home deletion from donut GUI showing "The home ? does not exist." — `/delhome` now opens the confirmation GUI when `homeDeleteConfirm` is enabled
10+
- Fixed cancelled TPA requests still being accepted — `/tpacancel` now properly removes the request from the target player's incoming requests
11+
912
# 1.0.3.5
1013

1114
- Added `/itemframe` command (`/iframe` alias), toggles visibility of the item frame you're looking at

src/main/java/fr/maxlego08/essentials/commands/commands/home/CommandDelHome.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ protected CommandResultType perform(EssentialsPlugin plugin) {
4545
}
4646

4747
if (homeManager.isHomeDeleteConfirm()) {
48-
message(user, Message.COMMAND_HOME_DELETE_CONFIRM, "%name%", homeName);
48+
Home home = user.getHome(homeName).orElse(null);
49+
if (home == null) {
50+
message(user, Message.COMMAND_HOME_DOESNT_EXIST, "%name%", homeName);
51+
return CommandResultType.DEFAULT;
52+
}
53+
homeManager.openInventoryConfirmHome(user, home);
4954
return CommandResultType.SUCCESS;
5055
}
5156

src/main/java/fr/maxlego08/essentials/user/ZUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void cancelTeleportRequest(User targetUser) {
233233

234234
if (request.getFromUser() == this) {
235235

236-
targetUser.setTeleportRequest(null);
236+
targetUser.removeIncomingTeleportRequest(this);
237237
this.teleports.remove(targetUser.getUniqueId());
238238

239239
message(this, Message.COMMAND_TP_CANCEL_SENDER, targetUser);

src/main/resources/patterns/home_down.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,9 @@ button:
3434

3535
else:
3636

37-
actions:
38-
- type: data
39-
action: SET
40-
key: 'home_to_delete'
41-
value: 'home_%remove_one_home%'
42-
- type: inventory
43-
inventory: 'home_delete'
44-
plugin: 'zEssentials'
37+
commands:
38+
- 'delhome home_%remove_one_home%'
39+
closeInventory: true
4540

4641
item:
4742
material: BLUE_DYE

0 commit comments

Comments
 (0)