From 05d121fe63ad102c7ddabc78f07918096baba287 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 11 Sep 2021 22:27:28 +0200 Subject: [PATCH] Fix rotation Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java | 2 +- .../src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java | 2 +- .../src/de/steamwar/fightsystem/fight/FightSchematic.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java b/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java index 5d3b1e3..a91d4eb 100644 --- a/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java +++ b/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java @@ -106,7 +106,7 @@ public class WorldeditWrapper14 implements WorldeditWrapper.IWorldeditWrapper { ch.setTransform(aT); Operations.completeBlindly(ch.createPaste(e).to(BukkitAdapter.asVector(position).add( aT.apply(Vector3.at(offset.getX(), offset.getY(), offset.getZ()).add(clipboard.getOrigin().toVector3()).subtract(clipboard.getMinimumPoint().toVector3())) - ).round().toBlockPoint()).build()); + ).toBlockPoint()).build()); e.flushSession(); } diff --git a/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java b/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java index 356d51a..2264f2b 100644 --- a/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java +++ b/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java @@ -105,7 +105,7 @@ public class WorldeditWrapper8 implements WorldeditWrapper.IWorldeditWrapper { ch.setTransform(aT); Operations.completeBlindly(ch.createPaste(e, w.getWorldData()).to(new Vector(position.getX(), position.getY(), position.getZ()).add( aT.apply(new Vector(offset.getX(), offset.getY(), offset.getZ()).add(clipboard.getOrigin()).subtract(clipboard.getMinimumPoint())) - ).round().toBlockPoint()).build()); + ).toBlockPoint()).build()); e.flushQueue(); } diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java index 892728c..159317d 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java @@ -135,8 +135,8 @@ public class FightSchematic extends StateDependent { -(Config.PasteAligned && Config.BlueToRedX != 0 ? region.getSizeX() : dims.getBlockX())/2.0, Config.WaterDepth != 0 ? Config.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0, -(Config.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ() : dims.getBlockZ())/2.0 - ), - new AffineTransform().rotateY(rotate ? 180 : 0).translate(rotate ? 0.5 : 0, 0, rotate ? 0.5 : 0) + ).add(new Vector(rotate ? 1 : 0, 0, rotate ? 1 : 0)), + new AffineTransform().rotateY(rotate ? 180 : 0) ); Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), freezer::disable, 3);