mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dont warn on markers

Browse Source
This commit is contained in:
cyberpwn 2021-09-12 09:28:41 -04:00
parent dcd3495564
commit 2191b539e3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/volmit/iris/core/service/CommandSVC.java
View File

@ -29,6 +29,7 @@ import com.volmit.iris.util.format.C;
import com.volmit.iris.util.plugin.IrisService; import com.volmit.iris.util.plugin.IrisService;
import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.plugin.VolmitSender;
import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.J;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;

10
src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@ -478,6 +478,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
Map<IrisPosition, KSet<IrisSpawner>> p = new KMap<>(); Map<IrisPosition, KSet<IrisSpawner>> p = new KMap<>();
getMantle().iterateChunk(c.getX(), c.getZ(), MatterMarker.class, (x, y, z, t) -> { getMantle().iterateChunk(c.getX(), c.getZ(), MatterMarker.class, (x, y, z, t) -> {
if(t.getTag().equals("cave_floor") || t.getTag().equals("cave_ceiling"))
{
return;
}
IrisMarker mark = getData().getMarkerLoader().load(t.getTag()); IrisMarker mark = getData().getMarkerLoader().load(t.getTag());
IrisPosition pos = new IrisPosition((c.getX() << 4) + x, y, (c.getZ() << 4) + z); IrisPosition pos = new IrisPosition((c.getX() << 4) + x, y, (c.getZ() << 4) + z);
for (String i : mark.getSpawners()) { for (String i : mark.getSpawners()) {
@ -500,6 +505,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
MatterMarker marker = getMantle().get(e.getBlock().getX(), e.getBlock().getY(), e.getBlock().getZ(), MatterMarker.class); MatterMarker marker = getMantle().get(e.getBlock().getX(), e.getBlock().getY(), e.getBlock().getZ(), MatterMarker.class);
if (marker != null) { if (marker != null) {
if(marker.getTag().equals("cave_floor") || marker.getTag().equals("cave_ceiling"))
{
return;
}
IrisMarker mark = getData().getMarkerLoader().load(marker.getTag()); IrisMarker mark = getData().getMarkerLoader().load(marker.getTag());
if (mark == null || mark.isRemoveOnChange()) { if (mark == null || mark.isRemoveOnChange()) {