Skip to content

Commit 3a5c7c4

Browse files
authored
Revert changes to /home and /sethome that break bed interactions (#6151)
This reverts PR #5991 (commit 3fe1495).
1 parent aebe851 commit 3a5c7c4

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -823,15 +823,12 @@ public void onPlayerInteract(final PlayerInteractEvent event) {
823823
break;
824824
}
825825
final User player = ess.getUser(event.getPlayer());
826-
final boolean isAuthorized = player.isAuthorized("essentials.sethome.bed");
827-
if (isAuthorized && player.getWorld().getEnvironment().equals(World.Environment.NORMAL)) {
826+
if (player.isAuthorized("essentials.sethome.bed") && player.getWorld().getEnvironment().equals(World.Environment.NORMAL)) {
828827
player.getBase().setBedSpawnLocation(event.getClickedBlock().getLocation());
829828
// In 1.15 and above, vanilla sends its own bed spawn message.
830829
if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_15_R01)) {
831830
player.sendTl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ());
832831
}
833-
} else if (!isAuthorized) {
834-
event.setCancelled(true);
835832
}
836833
}
837834
break;

Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,9 @@ public void run(final Server server, final User user, final String commandLabel,
7474
if (homes.isEmpty() && finalPlayer.equals(user)) {
7575
if (ess.getSettings().isSpawnIfNoHome()) {
7676
final UserTeleportHomeEvent event = new UserTeleportHomeEvent(user, null, bed != null ? bed : finalPlayer.getWorld().getSpawnLocation(), bed != null ? UserTeleportHomeEvent.HomeType.BED : UserTeleportHomeEvent.HomeType.SPAWN);
77-
if (event.getHomeType() != UserTeleportHomeEvent.HomeType.BED || finalPlayer.isAuthorized("essentials.home.bed")) {
78-
server.getPluginManager().callEvent(event);
79-
if (!event.isCancelled()) {
80-
user.getAsyncTeleport().respawn(charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel));
81-
}
82-
} else {
83-
showError(user.getBase(), new TranslatableException("noPerm", "essentials.home.bed"), commandLabel);
77+
server.getPluginManager().callEvent(event);
78+
if (!event.isCancelled()) {
79+
user.getAsyncTeleport().respawn(charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel));
8480
}
8581
} else {
8682
showError(user.getBase(), new TranslatableException("noHomeSetPlayer"), commandLabel);

0 commit comments

Comments
 (0)