Mirrors/FastAsyncWorldEdit
3
0
Fork 1
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-19 09:20:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

Cleanup

Quellcode durchsuchen
Dieser Commit ist enthalten in:
dordsor21 2024-06-27 12:10:01 +01:00
Ursprung 6f68b5e292
Commit 8d211cfe38
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B
6 geänderte Dateien mit 9 neuen und 9 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightServerLevelDelegateProxy.java
Datei anzeigen

@ -104,7 +104,7 @@ public class PaperweightServerLevelDelegateProxy implements InvocationHandler {
return null; return null;
} }
BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos)); BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos));
newEntity.load((CompoundTag) adapter.fromNativeBinary(this.editSession.getFullBlock( newEntity.load((CompoundTag) adapter.fromNativeLin(this.editSession.getFullBlock(
blockPos.getX(), blockPos.getX(),
blockPos.getY(), blockPos.getY(),
blockPos.getZ() blockPos.getZ()

2
worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightServerLevelDelegateProxy.java
Datei anzeigen

@ -104,7 +104,7 @@ public class PaperweightServerLevelDelegateProxy implements InvocationHandler {
return null; return null;
} }
BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos)); BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos));
newEntity.load((CompoundTag) adapter.fromNativeBinary(this.editSession.getFullBlock( newEntity.load((CompoundTag) adapter.fromNativeLin(this.editSession.getFullBlock(
blockPos.getX(), blockPos.getX(),
blockPos.getY(), blockPos.getY(),
blockPos.getZ() blockPos.getZ()

2
worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightServerLevelDelegateProxy.java
Datei anzeigen

@ -104,7 +104,7 @@ public class PaperweightServerLevelDelegateProxy implements InvocationHandler {
return null; return null;
} }
BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos)); BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos));
newEntity.load((CompoundTag) adapter.fromNativeBinary(this.editSession.getFullBlock( newEntity.load((CompoundTag) adapter.fromNativeLin(this.editSession.getFullBlock(
blockPos.getX(), blockPos.getX(),
blockPos.getY(), blockPos.getY(),
blockPos.getZ() blockPos.getZ()

2
worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R3/PaperweightServerLevelDelegateProxy.java
Datei anzeigen

@ -104,7 +104,7 @@ public class PaperweightServerLevelDelegateProxy implements InvocationHandler {
return null; return null;
} }
BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos)); BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos));
newEntity.load((CompoundTag) adapter.fromNativeBinary(this.editSession.getFullBlock( newEntity.load((CompoundTag) adapter.fromNativeLin(this.editSession.getFullBlock(
blockPos.getX(), blockPos.getX(),
blockPos.getY(), blockPos.getY(),
blockPos.getZ() blockPos.getZ()

2
worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightServerLevelDelegateProxy.java
Datei anzeigen

@ -105,7 +105,7 @@ public class PaperweightServerLevelDelegateProxy implements InvocationHandler {
} }
BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos)); BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos));
newEntity.loadWithComponents( newEntity.loadWithComponents(
(CompoundTag) adapter.fromNativeBinary(this.editSession.getFullBlock( (CompoundTag) adapter.fromNativeLin(this.editSession.getFullBlock(
blockPos.getX(), blockPos.getX(),
blockPos.getY(), blockPos.getY(),
blockPos.getZ() blockPos.getZ()

8
worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/PlacementStateProcessor.java
Datei anzeigen

@ -24,13 +24,13 @@ import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.registry.state.Property; import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.util.Direction; import com.sk89q.worldedit.util.Direction;
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockCategories; import com.sk89q.worldedit.world.block.BlockCategories;
import com.sk89q.worldedit.world.block.BlockCategory; import com.sk89q.worldedit.world.block.BlockCategory;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.block.BlockTypesCache; import com.sk89q.worldedit.world.block.BlockTypesCache;
import org.enginehub.linbus.tree.LinCompoundTag;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Map; import java.util.Map;
@ -472,9 +472,9 @@ public abstract class PlacementStateProcessor extends AbstractDelegateExtent imp
if (block.getOrdinalChar() != newOrdinal) { if (block.getOrdinalChar() != newOrdinal) {
BlockState newState = BlockTypesCache.states[newOrdinal]; BlockState newState = BlockTypesCache.states[newOrdinal];
orDefault.setBlock(set.x(), set.y(), set.z(), newState); orDefault.setBlock(set.x(), set.y(), set.z(), newState);
CompoundBinaryTag nbt = block.getNbt(); CompoundTag nbt = block.getNbtData();
if (nbt != null && newState.getBlockType() == block.getBlockType()) { if (nbt != null && newState.getBlockType() == block.getBlockType()) {
orDefault.setTile(set.x(), set.y(), set.z(), (CompoundTag) nbt.asBinaryTag()); orDefault.setTile(set.x(), set.y(), set.z(), nbt);
} }
return true; return true;
} }
@ -497,7 +497,7 @@ public abstract class PlacementStateProcessor extends AbstractDelegateExtent imp
char newOrdinal = getBlockOrdinal(position.x(), position.y(), position.z(), block.toBlockState()); char newOrdinal = getBlockOrdinal(position.x(), position.y(), position.z(), block.toBlockState());
if (block.getOrdinalChar() != newOrdinal) { if (block.getOrdinalChar() != newOrdinal) {
BlockState state = BlockTypesCache.states[newOrdinal]; BlockState state = BlockTypesCache.states[newOrdinal];
CompoundBinaryTag nbt = block.getNbt(); LinCompoundTag nbt = block.getNbt();
if (nbt != null && state.getBlockType() == block.getBlockType()) { if (nbt != null && state.getBlockType() == block.getBlockType()) {
state.toBaseBlock(nbt); state.toBaseBlock(nbt);
} }