Upstream/Boxed
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Boxed.git synced 2025-02-01 22:51:41 +01:00
Code Issues Projects Releases Wiki Activity

Resolve static analysis issues

Browse Source
This commit is contained in:
tastybento 2024-07-27 17:00:05 -07:00
parent cc85ca2279
commit cf4531fd26
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/world/bentobox/boxed/listeners/NewAreaListener.java
View File

@ -89,7 +89,7 @@ public class NewAreaListener implements Listener {
/** /**
* Store for structures that are pending being built, e.g., waiting until the chunk they are is in loaded * Store for structures that are pending being built, e.g., waiting until the chunk they are is in loaded
*/ */
private final Map<Pair<Integer, Integer>, List<StructureRecord>> readyToBuild; private final Map<Pair<Integer, Integer>, List<StructureRecord>> pending;
/** /**
* A cache of all structures that have been placed. Used to determine if players have entered them * A cache of all structures that have been placed. Used to determine if players have entered them
@ -100,9 +100,10 @@ public class NewAreaListener implements Listener {
private boolean pasting = true; private boolean pasting = true;
private static final Gson gson = new Gson(); private static final Gson gson = new Gson();
private static final String TODO = "ToDo"; private static final String TODO = "ToDo";
private static final String COULD_NOT_LOAD = "Could not load ";
// Database handler for structure data // Database handler for structure data
private final Database<IslandStructures> handler; private final Database<IslandStructures> handler;
private final Database<ToBePlacedStructures> todo; private final Database<ToBePlacedStructures> toPlace;
private static String bukkitVersion = "v" + Bukkit.getBukkitVersion().replace('.', '_').replace('-', '_'); private static String bukkitVersion = "v" + Bukkit.getBukkitVersion().replace('.', '_').replace('-', '_');
private static String pluginPackageName; private static String pluginPackageName;
@ -120,8 +121,8 @@ public class NewAreaListener implements Listener {
// Get database ready // Get database ready
handler = new Database<>(addon, IslandStructures.class); handler = new Database<>(addon, IslandStructures.class);
// Load the pending structures // Load the pending structures
todo = new Database<ToBePlacedStructures>(addon, ToBePlacedStructures.class); toPlace = new Database<>(addon, ToBePlacedStructures.class);
readyToBuild = this.loadToDos().getReadyToBuild(); pending = this.loadToDos().getReadyToBuild();
// Try to build something // Try to build something
runStructurePrinter(); runStructurePrinter();
} }
@ -167,7 +168,7 @@ public class NewAreaListener implements Listener {
// Place the structure - this cannot be done async // Place the structure - this cannot be done async
Structure structure = Bukkit.getStructureManager().loadStructure(NamespacedKey.fromString(item.structure())); Structure structure = Bukkit.getStructureManager().loadStructure(NamespacedKey.fromString(item.structure()));
if (structure == null) { if (structure == null) {
BentoBox.getInstance().logError("Could not load " + item.structure()); BentoBox.getInstance().logError(COULD_NOT_LOAD + item.structure());
return; return;
} }
structure.place(item.location(), true, item.rot(), item.mirror(), -1, 1, rand); structure.place(item.location(), true, item.rot(), item.mirror(), -1, 1, rand);
@ -185,7 +186,6 @@ public class NewAreaListener implements Listener {
} }
handler.saveObjectAsync(getIslandStructData(id)); handler.saveObjectAsync(getIslandStructData(id));
}); });
// Remove from the todo list
// Clear the semaphore // Clear the semaphore
pasting = false; pasting = false;
} }
@ -227,8 +227,8 @@ public class NewAreaListener implements Listener {
return; return;
} }
Pair<Integer, Integer> chunkCoords = new Pair<Integer, Integer>(chunk.getX(), chunk.getZ()); Pair<Integer, Integer> chunkCoords = new Pair<Integer, Integer>(chunk.getX(), chunk.getZ());
if (readyToBuild.containsKey(chunkCoords)) { if (pending.containsKey(chunkCoords)) {
Iterator<StructureRecord> it = readyToBuild.get(chunkCoords).iterator(); Iterator<StructureRecord> it = pending.get(chunkCoords).iterator();
while (it.hasNext()) { while (it.hasNext()) {
StructureRecord item = it.next(); StructureRecord item = it.next();
if (item.location().getWorld().equals(e.getWorld())) { if (item.location().getWorld().equals(e.getWorld())) {
@ -238,8 +238,8 @@ public class NewAreaListener implements Listener {
} }
// Save to latest to the database // Save to latest to the database
ToBePlacedStructures tbd = new ToBePlacedStructures(); ToBePlacedStructures tbd = new ToBePlacedStructures();
tbd.setReadyToBuild(readyToBuild); tbd.setReadyToBuild(pending);
todo.saveObjectAsync(tbd); toPlace.saveObjectAsync(tbd);
} }
} }
@ -372,7 +372,7 @@ public class NewAreaListener implements Listener {
Structure structure = Bukkit.getStructureManager() Structure structure = Bukkit.getStructureManager()
.loadStructure(NamespacedKey.fromString("minecraft:" + name)); .loadStructure(NamespacedKey.fromString("minecraft:" + name));
if (structure == null) { if (structure == null) {
BentoBox.getInstance().logError("Could not load " + name); BentoBox.getInstance().logError(COULD_NOT_LOAD + name);
return; return;
} }
@ -399,7 +399,7 @@ public class NewAreaListener implements Listener {
})); }));
tbd.setReadyToBuild(readyToBuild); tbd.setReadyToBuild(readyToBuild);
todo.saveObjectAsync(tbd); toPlace.saveObjectAsync(tbd);
} }
/** /**
@ -413,7 +413,7 @@ public class NewAreaListener implements Listener {
Location loc = item.location(); Location loc = item.location();
Structure structure = Bukkit.getStructureManager().loadStructure(NamespacedKey.fromString(item.structure())); Structure structure = Bukkit.getStructureManager().loadStructure(NamespacedKey.fromString(item.structure()));
if (structure == null) { if (structure == null) {
BentoBox.getInstance().logError("Could not load " + item.structure()); BentoBox.getInstance().logError(COULD_NOT_LOAD + item.structure());
return new BoundingBox(); return new BoundingBox();
} }
StructureRotation structureRotation = item.rot(); StructureRotation structureRotation = item.rot();
@ -629,10 +629,10 @@ public class NewAreaListener implements Listener {
} }
private ToBePlacedStructures loadToDos() { private ToBePlacedStructures loadToDos() {
if (!todo.objectExists(TODO)) { if (!toPlace.objectExists(TODO)) {
return new ToBePlacedStructures(); return new ToBePlacedStructures();
} }
ToBePlacedStructures list = todo.loadObject(TODO); ToBePlacedStructures list = toPlace.loadObject(TODO);
if (list == null) { if (list == null) {
return new ToBePlacedStructures(); return new ToBePlacedStructures();
} }

2
src/main/java/world/bentobox/boxed/objects/ToBePlacedStructures.java
View File

@ -16,7 +16,7 @@ import world.bentobox.bentobox.util.Pair;
/** /**
* Stores all the structures to be placed in the world. This is a queue that is done over * Stores all the structures to be placed in the world. This is a queue that is done over
* time to avoid lag and if the server is stopped then the todo list is saved here * time to avoid lag and if the server is stopped then the pending list is saved here
* @author tastybento * @author tastybento
* *
*/ */