Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed regen

Browse Source
This commit is contained in:
Jesse Boyd 2019-11-23 04:45:43 +00:00
parent 1844d4dba7
commit 97a4d2e103
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
View File

@ -192,7 +192,7 @@ public class BukkitWorld extends AbstractWorld {
public boolean regenerate(Region region, EditSession editSession) { public boolean regenerate(Region region, EditSession editSession) {
BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter(); BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
if (adapter != null) { if (adapter != null) {
return adapter.regenerate(this, region, editSession); return adapter.regenerate(getWorld(), region, editSession);
} }
/* /*
BaseBlock[] history = new BaseBlock[16 * 16 * (getMaxY() + 1)]; BaseBlock[] history = new BaseBlock[16 * 16 * (getMaxY() + 1)];

2
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
View File

@ -235,7 +235,7 @@ public interface BukkitImplAdapter<T> extends IBukkitAdapter {
throw new UnsupportedOperationException("Cannot send fake chunks"); throw new UnsupportedOperationException("Cannot send fake chunks");
} }
default boolean regenerate(com.sk89q.worldedit.world.World world, Region region, EditSession editSession) { default boolean regenerate(org.bukkit.World world, Region region, EditSession editSession) {
return editSession.regenerate(region); return editSession.regenerate(region);
} }
} }

2
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_14_R4.java
View File

@ -378,7 +378,7 @@ public final class FAWE_Spigot_v1_14_R4 extends CachedBukkitAdapter implements I
} }
@Override @Override
public boolean regenerate(com.sk89q.worldedit.world.World world, Region region, EditSession editSession) { public boolean regenerate(org.bukkit.World world, Region region, EditSession editSession) {
WorldServer originalWorld = ((CraftWorld) world).getHandle(); WorldServer originalWorld = ((CraftWorld) world).getHandle();
ChunkProviderServer provider = originalWorld.getChunkProvider(); ChunkProviderServer provider = originalWorld.getChunkProvider();
if (!(provider instanceof ChunkProviderServer)) { if (!(provider instanceof ChunkProviderServer)) {

2
worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
View File

@ -223,7 +223,7 @@ public class WorldWrapper extends AbstractWorld {
@Override @Override
public boolean regenerate(Region region, EditSession session) { public boolean regenerate(Region region, EditSession session) {
return session.regenerate(region); return parent.regenerate(region, session);
} }
@Override @Override

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/HistorySubCommands.java
View File

@ -330,7 +330,7 @@ public class HistorySubCommands {
RollbackOptimizedHistory edit = input.get(); RollbackOptimizedHistory edit = input.get();
UUID uuid = edit.getUUID(); UUID uuid = edit.getUUID();
int index = edit.getIndex(); int index = edit.getIndex();
if (!edit.getBDFile().exists()) { if (!edit.isEmpty()) {
database.delete(uuid, index); database.delete(uuid, index);
return TextComponent.empty(); return TextComponent.empty();
} }

5
worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java
View File

@ -656,13 +656,14 @@ public class RegionCommands {
@CommandPermissions("worldedit.regen") @CommandPermissions("worldedit.regen")
@Logging(REGION) @Logging(REGION)
@Confirm(Confirm.Processor.REGION) @Confirm(Confirm.Processor.REGION)
public void regenerateChunk(Actor actor, LocalSession session, EditSession editSession, @Selection Region region, public void regenerateChunk(Actor actor, World world, LocalSession session, EditSession editSession, @Selection Region region,
@Arg(def = "", desc = "Regenerate with biome") BiomeType biome, @Arg(def = "", desc = "Regenerate with biome") BiomeType biome,
@Arg(def = "", desc = "Regenerate with seed") Long seed) throws WorldEditException { @Arg(def = "", desc = "Regenerate with seed") Long seed) throws WorldEditException {
Mask mask = session.getMask(); Mask mask = session.getMask();
session.setMask((Mask) null); session.setMask((Mask) null);
session.setSourceMask((Mask) null); session.setSourceMask((Mask) null);
editSession.regenerate(region, biome, seed); world.regenerate(region, editSession);
// editSession.regenerate(region, biome, seed);
session.setMask(mask); session.setMask(mask);
session.setSourceMask(mask); session.setSourceMask(mask);
actor.printInfo(TranslatableComponent.of("worldedit.regen.regenerated")); actor.printInfo(TranslatableComponent.of("worldedit.regen.regenerated"));