Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

General cleanup

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
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.EntitySnapshot;
import org.spongepowered.api.entity.EntityTypes; import org.spongepowered.api.entity.EntityTypes;
import org.spongepowered.api.event.cause.Cause; 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 org.spongepowered.api.world.World;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -170,16 +172,14 @@ public abstract class SpongeWorld extends AbstractWorld {
} }
} }
@Override @Override
public WorldData getWorldData() { public WorldData getWorldData() {
return ForgeWorldData.getInstance(); return SpongeWorldData.getInstance();
} }
@Override @Override
public boolean isValidBlockType(int id) { public boolean isValidBlockType(int id) {
return (id == 0) || (IDHelper.resolveItem(id) != null); return (id == 0) || (IDHelper.resolveBlock(id) != null);
} }
@Override @Override

6
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/ForgeWorldData.java → worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldData.java
View File

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