Repo-Mirror/Custom-Crops
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Crops.git synced 2025-12-28 03:19:15 +00:00
Code Issues Releases Activity

3.5.9

Browse Source
This commit is contained in:
XiaoMoMi
2024-08-13 15:11:01 +08:00
parent 207b56a073
commit 8aac425480
16 changed files with 139 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/net/momirealms/customcrops/api/CustomCropsPlugin.java
View File

@@ -121,6 +121,8 @@ public abstract class CustomCropsPlugin extends JavaPlugin {
public abstract void reload();
public abstract boolean isHookedPluginEnabled(String hooked, String... versionPrefix);
public abstract boolean doesHookedPluginExist(String plugin);
public abstract String getServerVersion();

12
api/src/main/java/net/momirealms/customcrops/api/mechanic/item/custom/AbstractCustomListener.java
View File

@@ -31,6 +31,7 @@ import net.momirealms.customcrops.api.mechanic.world.level.WorldCrop;
import net.momirealms.customcrops.api.mechanic.world.level.WorldGlass;
import net.momirealms.customcrops.api.mechanic.world.level.WorldPot;
import net.momirealms.customcrops.api.util.EventUtils;
import net.momirealms.customcrops.api.util.LogUtils;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
@@ -166,12 +167,7 @@ public abstract class AbstractCustomListener implements Listener {
final Location location = block.getLocation();
Optional<CustomCropsBlock> customCropsBlock = CustomCropsPlugin.get().getWorldManager().getBlockAt(SimpleLocation.of(location));
if (customCropsBlock.isPresent()) {
if (customCropsBlock.get() instanceof WorldPot || customCropsBlock.get() instanceof WorldGlass) {
CustomCropsPlugin.get().getWorldManager().removeAnythingAt(SimpleLocation.of(location));
} else {
event.setCancelled(true);
return;
}
CustomCropsPlugin.get().getWorldManager().removeAnythingAt(SimpleLocation.of(location));
}
this.onPlaceBlock(
event.getPlayer(),
@@ -273,12 +269,12 @@ public abstract class AbstractCustomListener implements Listener {
}
}
@EventHandler (ignoreCancelled = true)
@EventHandler (ignoreCancelled = true, priority = EventPriority.HIGHEST)
public void onExplosion(EntityExplodeEvent event) {
this.itemManager.handleExplosion(event.getEntity(), event.blockList(), event);
}
@EventHandler (ignoreCancelled = true)
@EventHandler (ignoreCancelled = true, priority = EventPriority.HIGHEST)
public void onExplosion(BlockExplodeEvent event) {
this.itemManager.handleExplosion(null, event.blockList(), event);
}