Merge branch 'master' into newFightUI
Dieser Commit ist enthalten in:
Commit
e01828a731
@ -39,6 +39,7 @@ public class CraftbukkitWrapper8 implements CraftbukkitWrapper.ICraftbukkitWrapp
|
|||||||
public void resetChunk(World world, World backup, int x, int z) {
|
public void resetChunk(World world, World backup, int x, int z) {
|
||||||
net.minecraft.server.v1_8_R3.World w = ((CraftWorld) world).getHandle();
|
net.minecraft.server.v1_8_R3.World w = ((CraftWorld) world).getHandle();
|
||||||
Chunk chunk = w.getChunkAt(x, z);
|
Chunk chunk = w.getChunkAt(x, z);
|
||||||
|
((CraftWorld) backup).getHandle().chunkProviderServer.forceChunkLoad = true;
|
||||||
Chunk backupChunk = ((CraftWorld) backup).getHandle().getChunkAt(x, z);
|
Chunk backupChunk = ((CraftWorld) backup).getHandle().getChunkAt(x, z);
|
||||||
|
|
||||||
System.arraycopy(backupChunk.getSections(), 0, chunk.getSections(), 0, chunk.getSections().length);
|
System.arraycopy(backupChunk.getSections(), 0, chunk.getSections(), 0, chunk.getSections().length);
|
||||||
|
@ -136,7 +136,7 @@ public class FightSchematic extends StateDependent {
|
|||||||
Config.WaterDepth != 0 ? Config.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0,
|
Config.WaterDepth != 0 ? Config.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0,
|
||||||
-(Config.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ() : dims.getBlockZ())/2.0
|
-(Config.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ() : dims.getBlockZ())/2.0
|
||||||
),
|
),
|
||||||
new AffineTransform().rotateY(rotate ? 180 : 0)
|
new AffineTransform().rotateY(rotate ? 180 : 0).translate(rotate ? 0.5 : 0, 0, rotate ? 0.5 : 0)
|
||||||
);
|
);
|
||||||
|
|
||||||
Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), freezer::disable, 3);
|
Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), freezer::disable, 3);
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren