mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-08-24 23:03:01 +02:00
Sponge fixes
This commit is contained in:
parent
1a9ec84a4d
commit
994ca12102
2
pom.xml
2
pom.xml
|
@ -8,7 +8,7 @@
|
|||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<artifactId>PlotSquared</artifactId>
|
||||
<version>3.0.11</version>
|
||||
<version>3.0.13</version>
|
||||
<name>PlotSquared</name>
|
||||
<packaging>jar</packaging>
|
||||
<build>
|
||||
|
|
|
@ -95,7 +95,7 @@ public class DebugExec extends SubCommand {
|
|||
TaskManager.runTaskLater(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
onCommand(ConsolePlayer.getConsole(), new String[] {"runasync", "start.js"});
|
||||
onCommand(ConsolePlayer.getConsole(), new String[] {"run", "start.js"});
|
||||
}
|
||||
}, 1);
|
||||
}
|
||||
|
|
|
@ -337,7 +337,7 @@ public class MainCommand extends CommandManager<PlotPlayer> {
|
|||
MainUtil.sendMessage(plr, C.NOT_VALID_SUBCOMMAND);
|
||||
{
|
||||
List<Command<PlotPlayer>> cmds = getCommands(null, plr);
|
||||
if (label == null || (cmd = new StringComparison<>(label, cmds).getMatchObject()) == null) {
|
||||
if (label == null || cmds.size() == 0 || (cmd = new StringComparison<>(label, cmds).getMatchObject()) == null) {
|
||||
MainUtil.sendMessage(plr, C.DID_YOU_MEAN, "/plot help");
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -50,7 +50,7 @@ public class StringMan {
|
|||
else if (obj instanceof Collection<?>) {
|
||||
String result = "";
|
||||
String prefix = "";
|
||||
for (Object element : (List<?>) obj) {
|
||||
for (Object element : (Collection<?>) obj) {
|
||||
result += prefix + getString(element);
|
||||
prefix = ",";
|
||||
}
|
||||
|
|
|
@ -178,8 +178,6 @@ public class EntityWrapper {
|
|||
this.x = loc.getX();
|
||||
this.y = loc.getY();
|
||||
this.z = loc.getZ();
|
||||
System.out.print("ENTITY: " + entity.getType());
|
||||
System.out.print("ENTITY: " + entity.getType().getTypeId());
|
||||
this.id = entity.getType().getTypeId();
|
||||
if (depth == 0) {
|
||||
return;
|
||||
|
|
|
@ -494,7 +494,6 @@ public class BukkitChunkManager extends ChunkManager {
|
|||
public static void restoreEntities(final World world, final int x_offset, final int z_offset) {
|
||||
for (final EntityWrapper entity : entities) {
|
||||
try {
|
||||
System.out.print("RESTORING ENTITIE!: " + EntityType.fromId(entity.id));
|
||||
entity.spawn(world, x_offset, z_offset);
|
||||
} catch (final Exception e) {
|
||||
PS.debug("Failed to restore entity (e): " + entity.x + "," + entity.y + "," + entity.z + " : " + entity.id + " : " + EntityType.fromId(entity.id));
|
||||
|
|
|
@ -103,7 +103,6 @@ public class BukkitSetupUtils extends SetupUtils {
|
|||
return;
|
||||
}
|
||||
File file = new File("bukkit.yml").getAbsoluteFile();
|
||||
System.out.print(file.getAbsolutePath());
|
||||
YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
|
||||
yml.set("worlds." + world + ".generator", generator);
|
||||
try {
|
||||
|
|
|
@ -131,7 +131,11 @@ public class SpongeBlockManager extends BlockManager {
|
|||
|
||||
@Override
|
||||
public Location getSpawn(String world) {
|
||||
return SpongeUtil.getLocation(world, SpongeUtil.getWorld(world).getSpawnLocation());
|
||||
World worldObj = SpongeUtil.getWorld(world);
|
||||
org.spongepowered.api.world.Location loc = worldObj.getSpawnLocation();
|
||||
Location result = SpongeUtil.getLocation(world, SpongeUtil.getWorld(world).getSpawnLocation());
|
||||
result.setY(getHeighestBlock(world, result.getX(), result.getZ()));
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in New Issue
Block a user