dvorakmortonxd/FoliaFlow
1
1
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

remove display block

Browse source
This commit is contained in:
MidnightTale 2023-04-25 22:40:34 +07:00
commit d87eee5b8d
1 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/main/java/xyz/hynse/foliaflow/FoliaFlow.java
View file

@ -4,7 +4,6 @@ import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler;
import io.papermc.paper.threadedregions.scheduler.RegionScheduler; import io.papermc.paper.threadedregions.scheduler.RegionScheduler;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.type.Slab; import org.bukkit.block.data.type.Slab;
import org.bukkit.entity.BlockDisplay; import org.bukkit.entity.BlockDisplay;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -13,7 +12,6 @@ import org.bukkit.entity.FallingBlock;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityChangeBlockEvent;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -30,6 +28,7 @@ public class FoliaFlow extends JavaPlugin implements Listener {
private int counter = 0; private int counter = 0;
private final Set<Location> movingBlocks = new HashSet<>(); private final Set<Location> movingBlocks = new HashSet<>();
private final Map<Entity, Vector> velocitiesMap = new HashMap<>(); private final Map<Entity, Vector> velocitiesMap = new HashMap<>();
@Override @Override
public void onEnable() { public void onEnable() {
super.onEnable(); super.onEnable();
@ -72,6 +71,14 @@ public class FoliaFlow extends JavaPlugin implements Listener {
RegionScheduler schedulerdisplay = getServer().getRegionScheduler(); RegionScheduler schedulerdisplay = getServer().getRegionScheduler();
String tag = "FoliaFlow_Display"; String tag = "FoliaFlow_Display";
for (World world : Bukkit.getWorlds()) {
for (Entity entity : world.getEntities()) {
if (entity.getScoreboardTags().contains(tag)) {
entity.remove();
getLogger().info("Remove BlockDisplay" + "(" + tag + ") " + entity);
}
}
}
schedulerdisplay.run(this, Objects.requireNonNull(Bukkit.getWorld("world_the_end")), 1, 1, (schedulerTask) -> { schedulerdisplay.run(this, Objects.requireNonNull(Bukkit.getWorld("world_the_end")), 1, 1, (schedulerTask) -> {
World endWorld = getServer().getWorld("world_the_end"); World endWorld = getServer().getWorld("world_the_end");
@ -79,34 +86,17 @@ public class FoliaFlow extends JavaPlugin implements Listener {
Chunk chunk = endWorld.getChunkAt(0, 0); Chunk chunk = endWorld.getChunkAt(0, 0);
if (!chunk.isLoaded()) { if (!chunk.isLoaded()) {
chunk.load(); chunk.load();
} getLogger().info("Loaded Chunk");
// Check if the chunk already has a display block
for (Entity entity : chunk.getEntities()) {
if (entity instanceof BlockDisplay && entity.getScoreboardTags().contains(tag)) {
return;
}
} }
BlockDisplay display = (BlockDisplay) endWorld.spawnEntity(new Location(endWorld, 100.0005, 48, -0.0005), EntityType.BLOCK_DISPLAY); BlockDisplay display = (BlockDisplay) endWorld.spawnEntity(new Location(endWorld, 100.0005, 48, -0.0005), EntityType.BLOCK_DISPLAY);
display.setBlock(Bukkit.createBlockData(Material.OBSIDIAN)); display.setBlock(Bukkit.createBlockData(Material.OBSIDIAN));
display.addScoreboardTag(tag); display.addScoreboardTag(tag);
getLogger().info("Setup BlockDisplay" + "(" + tag + ") " + display);
}); });
getServer().getPluginManager().registerEvents(new Listener() {
@EventHandler getServer().getPluginManager().registerEvents(this, this);
public void onPluginDisable(PluginDisableEvent event) {
if (event.getPlugin() == FoliaFlow.this) {
for (World world : Bukkit.getWorlds()) {
for (Entity entity : world.getEntities()) {
if (entity instanceof BlockDisplay && entity.getScoreboardTags().contains(tag)) {
entity.remove();
}
}
}
}
}
}, this);
} }
@Override @Override
public void onDisable() { public void onDisable() {