General cleanup

This commit is contained in:
Wyatt Childers 2016-02-02 18:15:47 -05:00
parent c62125cd70
commit 5efbeec44f
2 changed files with 7 additions and 7 deletions

View File

@ -46,6 +46,8 @@ import org.spongepowered.api.data.property.block.SkyLuminanceProperty;
import org.spongepowered.api.entity.EntitySnapshot;
import org.spongepowered.api.entity.EntityTypes;
import org.spongepowered.api.event.cause.Cause;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.text.channel.MessageChannel;
import org.spongepowered.api.world.World;
import static com.google.common.base.Preconditions.checkNotNull;
@ -170,16 +172,14 @@ public abstract class SpongeWorld extends AbstractWorld {
}
}
@Override
public WorldData getWorldData() {
return ForgeWorldData.getInstance();
return SpongeWorldData.getInstance();
}
@Override
public boolean isValidBlockType(int id) {
return (id == 0) || (IDHelper.resolveItem(id) != null);
return (id == 0) || (IDHelper.resolveBlock(id) != null);
}
@Override

View File

@ -25,9 +25,9 @@ import com.sk89q.worldedit.world.registry.LegacyWorldData;
/**
* World data for the Forge platform.
*/
class ForgeWorldData extends LegacyWorldData {
class SpongeWorldData extends LegacyWorldData {
private static final ForgeWorldData INSTANCE = new ForgeWorldData();
private static final SpongeWorldData INSTANCE = new SpongeWorldData();
private final BiomeRegistry biomeRegistry = new SpongeBiomeRegistry();
@Override
@ -40,7 +40,7 @@ class ForgeWorldData extends LegacyWorldData {
*
* @return an instance
*/
public static ForgeWorldData getInstance() {
public static SpongeWorldData getInstance() {
return INSTANCE;
}