TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-01-05 23:08:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix improper target block handing in /tree & /bigtree (#3271)

Browse source
This commit is contained in:
Josh Roy 2020-05-13 18:55:17 -04:00 committed by GitHub
parent 302f0acbaa
commit b960ee365a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java
View file

@ -33,9 +33,11 @@ public class Commandbigtree extends EssentialsCommand {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
final Location loc = LocationUtil.getTarget(user.getBase()); final Location loc = LocationUtil.getTarget(user.getBase()).add(0, 1, 0);
final Location safeLocation = LocationUtil.getSafeDestination(loc); if (!user.getWorld().getBlockAt(loc).isPassable()) {
final boolean success = user.getWorld().generateTree(safeLocation, tree); throw new Exception(tl("bigTreeFailure"));
}
final boolean success = user.getWorld().generateTree(loc, tree);
if (success) { if (success) {
user.sendMessage(tl("bigTreeSuccess")); user.sendMessage(tl("bigTreeSuccess"));
} else { } else {

8
Essentials/src/com/earth2me/essentials/commands/Commandtree.java
View file

@ -42,9 +42,11 @@ public class Commandtree extends EssentialsCommand {
} }
} }
final Location loc = LocationUtil.getTarget(user.getBase()); final Location loc = LocationUtil.getTarget(user.getBase()).add(0, 1, 0);
final Location safeLocation = LocationUtil.getSafeDestination(loc); if (!user.getWorld().getBlockAt(loc).isPassable()) {
final boolean success = user.getWorld().generateTree(safeLocation, tree); throw new Exception(tl("treeFailure"));
}
final boolean success = user.getWorld().generateTree(loc, tree);
if (success) { if (success) {
user.sendMessage(tl("treeSpawned")); user.sendMessage(tl("treeSpawned"));
} else { } else {