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

aea5b68ced

Browse Source
This commit is contained in:
Jesse Boyd 2019-06-28 22:43:32 +10:00
parent ccfe274ff5
commit fecb380d44
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java
View File

@ -192,11 +192,11 @@ public class BukkitChunk_1_13 extends IntFaweChunk<Chunk, BukkitQueue_1_13> {
byte[] newBlockBytes = newBlockLight.asBytes(); byte[] newBlockBytes = newBlockLight.asBytes();
byte[] blockLightBytes = blockLight.asBytes(); byte[] blockLightBytes = blockLight.asBytes();
System.arraycopy(blockLightBytes, 0, newBlockBytes, 0, 2048); for (int i = 0; i < 2048; i++) newBlockBytes[i] = blockLightBytes[i];
if (skyLight != null) { if (skyLight != null) {
byte[] newSkyBytes = newSkyLight.asBytes(); byte[] newSkyBytes = newSkyLight.asBytes();
byte[] skyLightBytes = skyLight.asBytes(); byte[] skyLightBytes = skyLight.asBytes();
System.arraycopy(skyLightBytes, 0, newSkyBytes, 0, 2048); for (int i = 0; i < 2048; i++) newSkyBytes[i] = skyLightBytes[i];
} }
// Copy counters // Copy counters
@ -241,7 +241,7 @@ public class BukkitChunk_1_13 extends IntFaweChunk<Chunk, BukkitQueue_1_13> {
Object[] currArray = ((Object[]) BukkitQueue_1_13.fieldLinearBlocks.get(currentPalette)); Object[] currArray = ((Object[]) BukkitQueue_1_13.fieldLinearBlocks.get(currentPalette));
Object[] newArray = ((Object[]) BukkitQueue_1_13.fieldLinearBlocks.get(newPalette)); Object[] newArray = ((Object[]) BukkitQueue_1_13.fieldLinearBlocks.get(newPalette));
BukkitQueue_1_13.fieldLinearIndex.set(newPalette, BukkitQueue_1_13.fieldLinearIndex.get(currentPalette)); BukkitQueue_1_13.fieldLinearIndex.set(newPalette, BukkitQueue_1_13.fieldLinearIndex.get(currentPalette));
System.arraycopy(currArray, 0, newArray, 0, newArray.length); for (int i = 0; i < newArray.length; i++) newArray[i] = currArray[i];
} }
BukkitQueue_1_13.fieldPalette.set(paletteBlock, newPalette); BukkitQueue_1_13.fieldPalette.set(paletteBlock, newPalette);

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -346,8 +346,6 @@ public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
return equalsFuzzy((BlockState) obj); return equalsFuzzy((BlockState) obj);
} }
private Integer hashCodeCache = null;
@Override @Override
public int hashCode() { public int hashCode() {
return getOrdinal(); return getOrdinal();

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
View File

@ -280,7 +280,7 @@ public class BlockType implements FawePattern, Keyed {
@Override @Override
public int hashCode() { public int hashCode() {
return this.id.hashCode(); return settings.internalId;
} }
@Override @Override