mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-04-23 19:56:24 +02:00

* Begin to implement extended world heights: - Implemented in Bukkit module (and where required in Core module) * Implement extended world heights into core module * Add min gen height to setup, * Default gen/build heights based on minecraft version * Few fixes * Fix up queues * Address comments * Make road schematic stuff slightly more efficient by sharing queues * Minor fixes, don't overlay error many times for the same y * Fix incorrect schematic paste height, undo changes to HybridUtils * Overhall regenallroads method to make it work, make sure BukkitChunkCoordinator can/will finish * Process chunks in order when regenerating all roads * Address comments * Address comments * Ground level//bedrock is at min gen height - Add comment on == rather than <= being used - It's because it's only checking for the bedrock layer being broken if that's disabled * Fix offset for min build height in SchematicHandler * Better javadoc Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com> * Address inclusivity issues for max world height * Javadocs/comments/deprecation * Use world min/max heights if present in QueueCoordinator * Address some deprecations for regions and biome setting * Add a count for chunks we're currently trying to load to not skip chunks at the end of a queue's edit * Use minGenHeight + 1 rather than build height in AugmentedUtils * Create utility method for layer index in GenChunk * Correct height in HybridUtils, also use minGenHeight + 1 * Don't magically split to 128 height in regeneration * Add utility methods for world height in QueueCoordinator * Clean up ClassicPlotManager road creation/removal * Start generation at min gen height if bedrock is disabled * min gen height is set in PlotArea * Add note on schem y normalisation * Improve plot getVolume method readability * Don't overly extend height when regenerating road region * y index utility method in ChunknQueueCoordinator * Layer index utility method in LocalChunk * Use version min/max heights if world not present in QueueCoordinator * Fix min -> max * Don't allow players to modify outside build height when using plot set / schematics. - Also fixes schematic height issues * Remove debug * Address comments * Switch loadingChunks to AtomicInteger to be safe (in case of multi-threaded) * Fix "security" issue that was already present * Ensure sign isn't physicsed Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
139 lines
4.9 KiB
Java
139 lines
4.9 KiB
Java
/*
|
|
* _____ _ _ _____ _
|
|
* | __ \| | | | / ____| | |
|
|
* | |__) | | ___ | |_| (___ __ _ _ _ __ _ _ __ ___ __| |
|
|
* | ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
|
|
* | | | | (_) | |_ ____) | (_| | |_| | (_| | | | __/ (_| |
|
|
* |_| |_|\___/ \__|_____/ \__, |\__,_|\__,_|_| \___|\__,_|
|
|
* | |
|
|
* |_|
|
|
* PlotSquared plot management system for Minecraft
|
|
* Copyright (C) 2014 - 2022 IntellectualSites
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
package com.plotsquared.bukkit.util;
|
|
|
|
import com.plotsquared.bukkit.entity.EntityWrapper;
|
|
import com.plotsquared.bukkit.entity.ReplicatingEntityWrapper;
|
|
import com.plotsquared.core.location.Location;
|
|
import com.plotsquared.core.location.PlotLoc;
|
|
import com.sk89q.worldedit.bukkit.BukkitWorld;
|
|
import com.sk89q.worldedit.math.BlockVector3;
|
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
|
import com.sk89q.worldedit.world.block.BaseBlock;
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
import org.bukkit.Chunk;
|
|
import org.bukkit.World;
|
|
import org.bukkit.entity.Entity;
|
|
import org.bukkit.entity.Player;
|
|
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
public class ContentMap {
|
|
|
|
private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ContentMap.class.getSimpleName());
|
|
|
|
final Set<EntityWrapper> entities;
|
|
final Map<PlotLoc, BaseBlock[]> allBlocks;
|
|
|
|
ContentMap() {
|
|
this.entities = new HashSet<>();
|
|
this.allBlocks = new HashMap<>();
|
|
}
|
|
|
|
public void saveRegion(BukkitWorld world, int x1, int x2, int z1, int z2) {
|
|
if (z1 > z2) {
|
|
int tmp = z1;
|
|
z1 = z2;
|
|
z2 = tmp;
|
|
}
|
|
if (x1 > x2) {
|
|
int tmp = x1;
|
|
x1 = x2;
|
|
x2 = tmp;
|
|
}
|
|
for (int x = x1; x <= x2; x++) {
|
|
for (int z = z1; z <= z2; z++) {
|
|
saveBlocks(world, x, z);
|
|
}
|
|
}
|
|
}
|
|
|
|
void saveEntitiesOut(Chunk chunk, CuboidRegion region) {
|
|
for (Entity entity : chunk.getEntities()) {
|
|
Location location = BukkitUtil.adapt(entity.getLocation());
|
|
int x = location.getX();
|
|
int z = location.getZ();
|
|
if (BukkitChunkManager.isIn(region, x, z)) {
|
|
continue;
|
|
}
|
|
if (entity.getVehicle() != null) {
|
|
continue;
|
|
}
|
|
EntityWrapper wrap = new ReplicatingEntityWrapper(entity, (short) 2);
|
|
wrap.saveEntity();
|
|
this.entities.add(wrap);
|
|
}
|
|
}
|
|
|
|
void saveEntitiesIn(Chunk chunk, CuboidRegion region, boolean delete) {
|
|
for (Entity entity : chunk.getEntities()) {
|
|
Location location = BukkitUtil.adapt(entity.getLocation());
|
|
int x = location.getX();
|
|
int z = location.getZ();
|
|
if (!BukkitChunkManager.isIn(region, x, z)) {
|
|
continue;
|
|
}
|
|
if (entity.getVehicle() != null) {
|
|
continue;
|
|
}
|
|
EntityWrapper wrap = new ReplicatingEntityWrapper(entity, (short) 2);
|
|
wrap.saveEntity();
|
|
this.entities.add(wrap);
|
|
if (delete) {
|
|
if (!(entity instanceof Player)) {
|
|
entity.remove();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void restoreEntities(World world) {
|
|
for (EntityWrapper entity : this.entities) {
|
|
try {
|
|
entity.spawn(world, 0, 0);
|
|
} catch (Exception e) {
|
|
LOGGER.error("Failed to restore entity", e);
|
|
}
|
|
}
|
|
this.entities.clear();
|
|
}
|
|
|
|
private void saveBlocks(BukkitWorld world, int x, int z) {
|
|
BaseBlock[] ids = new BaseBlock[world.getMaxY() - world.getMinY() + 1];
|
|
for (short yIndex = 0; yIndex <= world.getMaxY() - world.getMinY(); yIndex++) {
|
|
BaseBlock block = world.getFullBlock(BlockVector3.at(x, yIndex + world.getMinY(), z));
|
|
ids[yIndex] = block;
|
|
}
|
|
PlotLoc loc = new PlotLoc(x, z);
|
|
this.allBlocks.put(loc, ids);
|
|
}
|
|
|
|
}
|