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

Jump to bottom

Ref: height limit check #4427

Merged
merged 4 commits into from
Jun 1, 2024
Merged

Ref: height limit check #4427

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
8642d22
Reformatting code
RedstoneFuture May 15, 2024
5eec25b
Removing of duplicated send-message action
RedstoneFuture May 15, 2024
79cc962
Removing of duplicated height-limit check
RedstoneFuture May 15, 2024
ece2d19
Updating imports
RedstoneFuture May 18, 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
30 changes: 3 additions & 27 deletions Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.world.block.BlockType;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.tag.Tag;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
Expand Down Expand Up @@ -164,13 +163,6 @@ public void blockCreate(BlockPlaceEvent event) {
if (plot != null) {
if (area.notifyIfOutsideBuildArea(pp, location.getY())) {
event.setCancelled(true);
pp.sendMessage(
TranslatableCaption.of("height.height_limit"),
TagResolver.builder()
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
.build()
);
return;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicated message sending: already included in notifyIfOutsideBuildArea()

}
if (!plot.hasOwner()) {
Expand Down Expand Up @@ -262,13 +254,6 @@ public void blockDestroy(BlockBreakEvent event) {
}
} else if (area.notifyIfOutsideBuildArea(plotPlayer, location.getY())) {
event.setCancelled(true);
plotPlayer.sendMessage(
TranslatableCaption.of("height.height_limit"),
TagResolver.builder()
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
.build()
);
return;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicated message sending: already included in notifyIfOutsideBuildArea()

}
if (!plot.hasOwner()) {
Expand Down Expand Up @@ -1224,18 +1209,9 @@ public void onBlockMultiPlace(BlockMultiPlaceEvent event) {
if (pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
continue;
}
if (currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()) {
pp.sendMessage(
TranslatableCaption.of("height.height_limit"),
TagResolver.builder()
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
.build()
);
if (area.notifyIfOutsideBuildArea(pp, currentLocation.getY())) {
event.setCancelled(true);
break;
}
if (area.notifyIfOutsideBuildArea(pp, currentLocation.getY())) {
event.setCancelled(true);
break;
}
Copy link
Member Author

@RedstoneFuture RedstoneFuture May 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check in line 1227 looks exactly like the check in notifyIfOutsideBuildArea().

Line 1227:

currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()

/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java#L676-L677:

    public boolean notifyIfOutsideBuildArea(PlotPlayer<?> player, int y) {
        if (!buildRangeContainsY(y) && !player.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
            ...
            // Return true if "failed" as the method will always be inverted otherwise
            return true;
        }
        return false;
    }

}

Expand Down
6 changes: 2 additions & 4 deletions Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,10 +679,8 @@ public boolean notifyIfOutsideBuildArea(PlotPlayer<?> player, int y) {
TranslatableCaption.of("height.height_limit"),
TagResolver.builder()
.tag("minheight", Tag.inserting(Component.text(minBuildHeight)))
.tag(
"maxheight",
Tag.inserting(Component.text(maxBuildHeight))
).build()
.tag("maxheight", Tag.inserting(Component.text(maxBuildHeight)))
.build()
);
// Return true if "failed" as the method will always be inverted otherwise
return true;
Expand Down
Loading