Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix other forge compile issues

Browse Source
This commit is contained in:
Jesse Boyd 2016-06-22 16:02:50 +10:00
parent 27d5e9e1aa
commit cf397524ff
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/com/boydti/fawe/wrappers/LocationMaskedPlayerWrapper.java
View File

@ -36,7 +36,6 @@ public class LocationMaskedPlayerWrapper extends PlayerWrapper {
@Override @Override
public void setPosition(Vector pos, float pitch, float yaw) { public void setPosition(Vector pos, float pitch, float yaw) {
System.out.println("SET POSITION");
this.position = pos; this.position = pos;
} }
} }

2
forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java
View File

@ -67,7 +67,7 @@ public class ForgeMain {
FawePlayer fp = FawePlayer.wrap(player); FawePlayer fp = FawePlayer.wrap(player);
if (fp.getMeta("lastWorld") != event.world) { if (fp.getMeta("lastWorld") != event.world) {
fp.setMeta("lastWorld", event.world); fp.setMeta("lastWorld", event.world);
if (Settings.STORE_HISTORY_ON_DISK) { if (Settings.HISTORY.USE_DISK) {
fp.getSession().clearHistory(); fp.getSession().clearHistory();
fp.loadSessionsFromDisk(fp.getWorld()); fp.loadSessionsFromDisk(fp.getWorld());
} }

2
forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java
View File

@ -67,7 +67,7 @@ public class ForgeMain {
FawePlayer fp = FawePlayer.wrap(player); FawePlayer fp = FawePlayer.wrap(player);
if (fp.getMeta("lastWorld") != event.world) { if (fp.getMeta("lastWorld") != event.world) {
fp.setMeta("lastWorld", event.world); fp.setMeta("lastWorld", event.world);
if (Settings.STORE_HISTORY_ON_DISK) { if (Settings.HISTORY.USE_DISK) {
fp.getSession().clearHistory(); fp.getSession().clearHistory();
fp.loadSessionsFromDisk(fp.getWorld()); fp.loadSessionsFromDisk(fp.getWorld());
} }

2
sponge/src/main/java/com/boydti/fawe/sponge/FaweSponge.java
View File

@ -111,7 +111,7 @@ public class FaweSponge implements IFawe {
@Override @Override
public FaweQueue getNewQueue(String world, boolean fast) { public FaweQueue getNewQueue(String world, boolean fast) {
if (fast || Settings.COMBINE_HISTORY_STAGE) { if (fast || Settings.HISTORY.COMBINE_STAGES) {
try { try {
return new SpongeQueue_1_8(world); return new SpongeQueue_1_8(world);
} catch (Throwable e) { } catch (Throwable e) {

2
sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java
View File

@ -64,7 +64,7 @@ public class SpongeMain {
@Listener @Listener
public void onMove(DisplaceEntityEvent.TargetPlayer event) { public void onMove(DisplaceEntityEvent.TargetPlayer event) {
if (Settings.STORE_HISTORY_ON_DISK) { if (Settings.HISTORY.USE_DISK) {
World from = event.getFromTransform().getExtent(); World from = event.getFromTransform().getExtent();
World to = event.getToTransform().getExtent(); World to = event.getToTransform().getExtent();
if (!from.equals(to)) { if (!from.equals(to)) {

4
sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java
View File

@ -236,7 +236,7 @@ public class SpongeQueue_ALL extends NMSMappedFaweQueue<World, net.minecraft.wor
@Override @Override
public boolean setComponents(FaweChunk fc, RunnableVal<FaweChunk> changeTask) { public boolean setComponents(FaweChunk fc, RunnableVal<FaweChunk> changeTask) {
if (changeTask != null) { if (changeTask != null) {
Settings.COMBINE_HISTORY_STAGE = false; Settings.HISTORY.COMBINE_STAGES = false;
throw new UnsupportedOperationException("Combine stages not supported"); throw new UnsupportedOperationException("Combine stages not supported");
} }
SpongeChunk_1_8 fs = (SpongeChunk_1_8) fc; SpongeChunk_1_8 fs = (SpongeChunk_1_8) fc;
@ -296,7 +296,7 @@ public class SpongeQueue_ALL extends NMSMappedFaweQueue<World, net.minecraft.wor
@Override @Override
public CharFaweChunk getPrevious(CharFaweChunk fs, ExtendedBlockStorage[] sections, Map<?, ?> tilesGeneric, Collection<?>[] entitiesGeneric, Set<UUID> createdEntities, boolean all) throws Exception { public CharFaweChunk getPrevious(CharFaweChunk fs, ExtendedBlockStorage[] sections, Map<?, ?> tilesGeneric, Collection<?>[] entitiesGeneric, Set<UUID> createdEntities, boolean all) throws Exception {
Settings.COMBINE_HISTORY_STAGE = false; Settings.HISTORY.COMBINE_STAGES = false;
throw new UnsupportedOperationException("Combine stages not supported"); throw new UnsupportedOperationException("Combine stages not supported");
} }