EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Matt
2016-03-19 14:07:55 -04:00
parent 8074d041b8
commit 19b6df8268
17 changed files with 115 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
View File

@ -317,15 +317,9 @@ public class SpongeMain implements IPlotMain {
if (world == null) {
// create world
final ConfigurationSection worldConfig = PS.get().config.getConfigurationSection("worlds." + worldname);
String manager = worldConfig.getString("generator.plugin");
if (manager == null) {
manager = "PlotSquared";
}
String generator = worldConfig.getString("generator.init");
if (generator == null) {
generator = manager;
}
String manager = worldConfig.getString("generator.plugin", "PlotSquared");
String generator = worldConfig.getString("generator.init", manager);
final int type = worldConfig.getInt("generator.type");
final int terrain = worldConfig.getInt("generator.terrain");
final SetupObject setup = new SetupObject();

11
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java
View File

@ -97,14 +97,9 @@ public class SpongeChunkManager extends ChunkManager {
}
Field fieldDroppedChunksSet;
try {
fieldDroppedChunksSet = chunkServer.getClass().getField("field_73248_b");
fieldDroppedChunksSet = chunkServer.getClass().getField("droppedChunksSet");
} catch (Throwable t) {
try {
fieldDroppedChunksSet = chunkServer.getClass().getField("droppedChunksSet");
}
catch (Throwable t2) {
fieldDroppedChunksSet = ReflectionUtils.findField(chunkServer.getClass(), Set.class);
}
fieldDroppedChunksSet = ReflectionUtils.findField(chunkServer.getClass(), Set.class);
}
Set<Long> set = (Set<Long>) fieldDroppedChunksSet.get(chunkServer);
set.remove(pos);
@ -178,4 +173,4 @@ public class SpongeChunkManager extends ChunkManager {
throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
}
}
}