mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-05 07:04:43 +02:00
Compare commits
3 Commits
debug/home
...
fix/wrong-
Author | SHA1 | Date | |
---|---|---|---|
2633aa41a0 | |||
742d78a505 | |||
120bf37196 |
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@ -27,6 +27,7 @@ body:
|
||||
description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
|
||||
multiple: false
|
||||
options:
|
||||
- '1.19.3'
|
||||
- '1.19.2'
|
||||
- '1.19.1'
|
||||
- '1.19'
|
||||
|
@ -71,6 +71,7 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.block.BlockState;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.block.data.type.Dispenser;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Fireball;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -100,7 +101,6 @@ import org.bukkit.event.block.EntityBlockFormEvent;
|
||||
import org.bukkit.event.block.LeavesDecayEvent;
|
||||
import org.bukkit.event.block.SpongeAbsorbEvent;
|
||||
import org.bukkit.event.world.StructureGrowEvent;
|
||||
import org.bukkit.material.Directional;
|
||||
import org.bukkit.projectiles.BlockProjectileSource;
|
||||
import org.bukkit.util.Vector;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
@ -926,6 +926,9 @@ public class BlockEventListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void onBlockDispense(BlockDispenseEvent event) {
|
||||
if (!this.plotAreaManager.hasPlotArea(event.getBlock().getWorld().getName())) {
|
||||
return;
|
||||
}
|
||||
Material type = event.getItem().getType();
|
||||
switch (type.toString()) {
|
||||
case "SHULKER_BOX", "WHITE_SHULKER_BOX", "ORANGE_SHULKER_BOX", "MAGENTA_SHULKER_BOX", "LIGHT_BLUE_SHULKER_BOX",
|
||||
@ -937,7 +940,7 @@ public class BlockEventListener implements Listener {
|
||||
if (event.getBlock().getType() == Material.DROPPER) {
|
||||
return;
|
||||
}
|
||||
BlockFace targetFace = ((Directional) event.getBlock().getState().getData()).getFacing();
|
||||
BlockFace targetFace = ((Dispenser) event.getBlock().getBlockData()).getFacing();
|
||||
Location location = BukkitUtil.adapt(event.getBlock().getRelative(targetFace).getLocation());
|
||||
if (location.isPlotRoad()) {
|
||||
event.setCancelled(true);
|
||||
|
@ -114,26 +114,14 @@ public abstract class SquarePlotManager extends GridPlotManager {
|
||||
end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
|
||||
}
|
||||
int size = squarePlotWorld.PLOT_WIDTH + squarePlotWorld.ROAD_WIDTH;
|
||||
int idx;
|
||||
if (x < 0) {
|
||||
idx = x / size;
|
||||
x = size + (x % size);
|
||||
} else {
|
||||
idx = (x / size) + 1;
|
||||
x = x % size;
|
||||
}
|
||||
int idz;
|
||||
if (z < 0) {
|
||||
idz = z / size;
|
||||
z = size + (z % size);
|
||||
} else {
|
||||
idz = (z / size) + 1;
|
||||
z = z % size;
|
||||
}
|
||||
if (z <= pathWidthLower || z > end || x <= pathWidthLower || x > end) {
|
||||
int dx = Math.floorDiv(x, size) + 1;
|
||||
int rx = Math.floorMod(x, size);
|
||||
int dz = Math.floorDiv(z, size) + 1;
|
||||
int rz = Math.floorMod(z, size);
|
||||
if (rz <= pathWidthLower || rz > end || rx <= pathWidthLower || rx > end) {
|
||||
return null;
|
||||
} else {
|
||||
return PlotId.of(idx, idz);
|
||||
return PlotId.of(dx, dz);
|
||||
}
|
||||
}
|
||||
|
||||
@ -180,24 +168,10 @@ public abstract class SquarePlotManager extends GridPlotManager {
|
||||
}
|
||||
end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
|
||||
}
|
||||
int dx;
|
||||
int rx;
|
||||
if (x < 0) {
|
||||
dx = x / size;
|
||||
rx = size + (x % size);
|
||||
} else {
|
||||
dx = (x / size) + 1;
|
||||
rx = x % size;
|
||||
}
|
||||
int dz;
|
||||
int rz;
|
||||
if (z < 0) {
|
||||
dz = z / size;
|
||||
rz = size + (z % size);
|
||||
} else {
|
||||
dz = (z / size) + 1;
|
||||
rz = z % size;
|
||||
}
|
||||
int dx = Math.floorDiv(x, size) + 1;
|
||||
int rx = Math.floorMod(x, size);
|
||||
int dz = Math.floorDiv(z, size) + 1;
|
||||
int rz = Math.floorMod(z, size);
|
||||
PlotId id = PlotId.of(dx, dz);
|
||||
boolean[] merged = new boolean[]{rz <= pathWidthLower, rx > end, rz > end, rx <= pathWidthLower};
|
||||
int hash = HashUtil.hash(merged);
|
||||
|
Reference in New Issue
Block a user