mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-10-25 13:30:10 +00:00
remove World#isTerraWorld
This commit is contained in:
1 parent
a753351137
commit
fe68aa6279
6 files changed
+1
-11
No files matched your search
@@ -55,10 +55,6 @@ public interface World extends Handle {
|
|||||||
|
|
||||||
int getMinHeight();
|
int getMinHeight();
|
||||||
|
|
||||||
default boolean isTerraWorld() {
|
|
||||||
return getGenerator().getHandle() instanceof GeneratorWrapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
default TerraChunkGenerator getTerraGenerator() {
|
default TerraChunkGenerator getTerraGenerator() {
|
||||||
return ((GeneratorWrapper) getGenerator().getHandle()).getHandle();
|
return ((GeneratorWrapper) getGenerator().getHandle()).getHandle();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -66,7 +66,7 @@ public class TerraCommandManager implements CommandManager {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !(((Player) sender).world()).isTerraWorld())) {
|
if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player))) {
|
||||||
sender.sendMessage("Command must be executed in a Terra world.");
|
sender.sendMessage("Command must be executed in a Terra world.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -51,7 +51,6 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static synchronized void fixChunk(Chunk c) {
|
public static synchronized void fixChunk(Chunk c) {
|
||||||
if(!c.getWorld().isTerraWorld()) throw new IllegalArgumentException();
|
|
||||||
popMap.get(c.getWorld()).checkNeighbors(c.getX(), c.getZ(), c.getWorld());
|
popMap.get(c.getWorld()).checkNeighbors(c.getX(), c.getZ(), c.getWorld());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ public class CommonListener implements Listener {
|
|||||||
public void onSaplingGrow(StructureGrowEvent e) {
|
public void onSaplingGrow(StructureGrowEvent e) {
|
||||||
if(e.isCancelled()) return;
|
if(e.isCancelled()) return;
|
||||||
World bukkit = BukkitAdapter.adapt(e.getWorld());
|
World bukkit = BukkitAdapter.adapt(e.getWorld());
|
||||||
if(!bukkit.isTerraWorld()) return;
|
|
||||||
WorldConfig c = bukkit.getConfig();
|
WorldConfig c = bukkit.getConfig();
|
||||||
if(c.isDisableSaplings()) return;
|
if(c.isDisableSaplings()) return;
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ public class PaperListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onStructureLocate(StructureLocateEvent e) {
|
public void onStructureLocate(StructureLocateEvent e) {
|
||||||
if(!BukkitAdapter.adapt(e.getWorld()).isTerraWorld()) return;
|
|
||||||
String name = "minecraft:" + e.getType().getName();
|
String name = "minecraft:" + e.getType().getName();
|
||||||
main.getDebugLogger().info("Overriding structure location for \"" + name + "\"");
|
main.getDebugLogger().info("Overriding structure location for \"" + name + "\"");
|
||||||
World w = BukkitAdapter.adapt(e.getWorld());
|
World w = BukkitAdapter.adapt(e.getWorld());
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ public class SpigotListener implements Listener {
|
|||||||
Entity entity = e.getEntity();
|
Entity entity = e.getEntity();
|
||||||
if(e.getEntityType().equals(EntityType.ENDER_SIGNAL)) {
|
if(e.getEntityType().equals(EntityType.ENDER_SIGNAL)) {
|
||||||
main.getDebugLogger().info("Detected Ender Signal...");
|
main.getDebugLogger().info("Detected Ender Signal...");
|
||||||
if(!BukkitAdapter.adapt(e.getEntity().getWorld()).isTerraWorld()) return;
|
|
||||||
World w = BukkitAdapter.adapt(e.getEntity().getWorld());
|
World w = BukkitAdapter.adapt(e.getEntity().getWorld());
|
||||||
EnderSignal signal = (EnderSignal) entity;
|
EnderSignal signal = (EnderSignal) entity;
|
||||||
ConfiguredStructure config = tw.getConfig().getRegistry(TerraStructure.class).get(w.getConfig().getLocatable().get("STRONGHOLD"));
|
ConfiguredStructure config = tw.getConfig().getRegistry(TerraStructure.class).get(w.getConfig().getLocatable().get("STRONGHOLD"));
|
||||||
@@ -54,7 +53,6 @@ public class SpigotListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onCartographerChange(VillagerAcquireTradeEvent e) {
|
public void onCartographerChange(VillagerAcquireTradeEvent e) {
|
||||||
if(!BukkitAdapter.adapt(e.getEntity().getWorld()).isTerraWorld()) return;
|
|
||||||
if(!(e.getEntity() instanceof Villager)) return;
|
if(!(e.getEntity() instanceof Villager)) return;
|
||||||
if(((Villager) e.getEntity()).getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
|
if(((Villager) e.getEntity()).getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
|
||||||
main.logger().severe("Prevented server crash by stopping Cartographer villager from spawning.");
|
main.logger().severe("Prevented server crash by stopping Cartographer villager from spawning.");
|
||||||
@@ -66,7 +64,6 @@ public class SpigotListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onCartographerLevel(VillagerCareerChangeEvent e) {
|
public void onCartographerLevel(VillagerCareerChangeEvent e) {
|
||||||
if(!BukkitAdapter.adapt(e.getEntity().getWorld()).isTerraWorld()) return;
|
|
||||||
if(e.getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
|
if(e.getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
|
||||||
main.logger().severe("Prevented server crash by stopping Cartographer villager from spawning.");
|
main.logger().severe("Prevented server crash by stopping Cartographer villager from spawning.");
|
||||||
main.logger().severe("Please upgrade to Paper, which has a StructureLocateEvent that fixes this issue");
|
main.logger().severe("Please upgrade to Paper, which has a StructureLocateEvent that fixes this issue");
|
||||||
|
|||||||
Reference in new issue
Block a user