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

无法放置货运系统的头颅 #839

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

无法放置货运系统的头颅 #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a555559
fix(cargo):#832
JWJUN233233 Feb 15, 2024
f1a56be
style: spotless
JWJUN233233 Feb 15, 2024
7a84b7a
fix(cargo): #832
JWJUN233233 Feb 17, 2024
4d1beaf
style: spotless
JWJUN233233 Feb 17, 2024
25dd643
优化代码
JWJUN233233 Apr 20, 2024
661cd4f
style: spotless
JWJUN233233 Apr 26, 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
3 changes: 0 additions & 3 deletions ...n/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlcommon/SqlCommonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import java.sql.Time;
import java.util.Properties;
import java.util.concurrent.TimeUnit;

public abstract class SqlCommonConfig implements ISqlCommonConfig {
protected final String host;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlite/SqliteConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import com.xzavier0722.mc.plugin.slimefun4.storage.adapter.sqlcommon.ISqlCommonConfig;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import java.util.Properties;
import java.util.concurrent.TimeUnit;

public record SqliteConfig(String path, int maxConnection) implements ISqlCommonConfig {
public HikariDataSource createDataSource() {
Expand Down
35 changes: 29 additions & 6 deletions ...n/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/CargoNodeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.CargoNode;
import javax.annotation.Nonnull;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Container;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Directional;
import org.bukkit.block.data.Rotatable;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockPlaceEvent;
Expand All @@ -25,17 +30,35 @@ public CargoNodeListener(@Nonnull Slimefun plugin) {

@EventHandler(ignoreCancelled = true)
public void onCargoNodePlace(BlockPlaceEvent e) {
Block b = e.getBlock();
if (isCargoNode(e.getItemInHand())) {
Block b = e.getBlock();

if (isCargoNode(e.getItemInHand())
&& (b.getY() != e.getBlockAgainst().getY()
|| !e.getBlockReplacedState().getType().isAir())) {
Slimefun.getLocalization().sendMessage(e.getPlayer(), "machines.CARGO_NODES.must-be-placed", true);
e.setCancelled(true);
// || !e.getBlockReplacedState().getType().isAir() 这会导致#832
BlockData blockData = b.getBlockData();
BlockFace blockFace;
if (blockData instanceof Directional directional) {
blockFace = directional.getFacing().getOppositeFace();
} else if (blockData instanceof Rotatable rotatable) {
blockFace = rotatable.getRotation().getOppositeFace();
} else {
e.setCancelled(true);
return;
}

Block realAgainst = b.getRelative(blockFace);
if (!isContainer(realAgainst)) {
Slimefun.getLocalization().sendMessage(e.getPlayer(), "machines.CARGO_NODES.must-be-placed", true);
e.setCancelled(true);
}
}
}

private boolean isCargoNode(@Nonnull ItemStack item) {
return SlimefunItem.getByItem(item) instanceof CargoNode;
}

private boolean isContainer(@Nonnull Block block) {
return block.getState() instanceof Container
|| Slimefun.getDatabaseManager().getBlockDataController().getBlockData(block.getLocation()) != null;
}
}
Loading