Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 03:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Current Progress #3

Browse Source
This commit is contained in:
IronApollo
2019-01-09 02:13:44 -05:00
parent d4157b7e0e
commit 842b1307c7
221 changed files with 3173 additions and 3041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
View File

@ -19,13 +19,10 @@
package com.sk89q.worldedit.world;
<<<<<<< HEAD
import com.sk89q.worldedit.*;
=======
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.WorldEditException;
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
@ -128,18 +125,18 @@ public class NullWorld extends AbstractWorld {
}
@Override
<<<<<<< HEAD
public BlockState getLazyBlock(Vector position) {
//<<<<<<< HEAD
public BlockState getLazyBlock(BlockVector3 position) {
return getBlock(position);
}
@Override
public BlockState getFullBlock(Vector position) {
public BlockState getFullBlock(BlockVector3 position) {
return getBlock(position);
=======
public BaseBlock getFullBlock(BlockVector3 position) {
return getBlock(position).toBaseBlock();
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
//=======
// public BaseBlock getFullBlock(BlockVector3 position) {
// return getBlock(position).toBaseBlock();
//>>>>>>> 399e0ad5... Refactor vector system to be cleaner
}
@Override