mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-09-06 15:58:20 +00:00
Updated for SpoutAPI entity changes
This commit is contained in:
parent
c6ce8541bc
commit
22b4d0adfb
@ -59,19 +59,19 @@ public class SpoutPlayer extends LocalPlayer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public WorldVector getPosition() {
|
public WorldVector getPosition() {
|
||||||
Point loc = player.getEntity().getTransform().getPosition();
|
Point loc = player.getEntity().getPoint();
|
||||||
return new WorldVector(SpoutUtil.getLocalWorld(loc.getWorld()),
|
return new WorldVector(SpoutUtil.getLocalWorld(loc.getWorld()),
|
||||||
loc.getX(), loc.getY(), loc.getZ());
|
loc.getX(), loc.getY(), loc.getZ());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getPitch() {
|
public double getPitch() {
|
||||||
return player.getEntity().getTransform().getRotation().getAxisAngles().getY();
|
return player.getEntity().getPitch();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getYaw() {
|
public double getYaw() {
|
||||||
return player.getEntity().getTransform().getRotation().getAxisAngles().getZ();
|
return player.getEntity().getYaw();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -109,9 +109,9 @@ public class SpoutPlayer extends LocalPlayer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPosition(Vector pos, float pitch, float yaw) {
|
public void setPosition(Vector pos, float pitch, float yaw) {
|
||||||
Transform t = player.getEntity().getTransform();
|
player.getEntity().setPoint((float)pos.getX(), (float)pos.getY(), (float)pos.getZ());
|
||||||
t.setPosition(new Point(t.getPosition().getWorld(), (float) pos.getX(), (float) pos.getY(), (float) pos.getZ()));
|
player.getEntity().setPitch(pitch);
|
||||||
t.setRotation(new Quaternion(pitch, Vector3.UNIT_Z).rotate(yaw, Vector3.UNIT_Y));
|
player.getEntity().setYaw(yaw);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -131,7 +131,7 @@ public class SpoutPlayer extends LocalPlayer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LocalWorld getWorld() {
|
public LocalWorld getWorld() {
|
||||||
return SpoutUtil.getLocalWorld(player.getEntity().getTransform().getPosition().getWorld());
|
return SpoutUtil.getLocalWorld(player.getEntity().getPoint().getWorld());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -81,7 +81,8 @@ public class SpoutServerInterface extends ServerInterface {
|
|||||||
public void onCommandRegistration(List<Command> commands) {
|
public void onCommandRegistration(List<Command> commands) {
|
||||||
for (Command command : commands) {
|
for (Command command : commands) {
|
||||||
Spout.getGame().getRootCommand().addSubCommand(plugin, command.aliases()[0])
|
Spout.getGame().getRootCommand().addSubCommand(plugin, command.aliases()[0])
|
||||||
.addAlias(command.aliases()).setRawExecutor(executor).closeSubCommand();
|
.addAlias(command.aliases()).setRawExecutor(executor).
|
||||||
|
setUsage(command.usage()).setHelp(command.desc()).closeSubCommand();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -311,7 +311,7 @@ public class WorldEditPlugin extends CommonPlugin implements Named {
|
|||||||
}
|
}
|
||||||
|
|
||||||
LocalSession session = controller.getSession(wrapPlayer(player));
|
LocalSession session = controller.getSession(wrapPlayer(player));
|
||||||
RegionSelector selector = session.getRegionSelector(SpoutUtil.getLocalWorld(player.getEntity().getTransform().getPosition().getWorld()));
|
RegionSelector selector = session.getRegionSelector(SpoutUtil.getLocalWorld(player.getEntity().getPoint().getWorld()));
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Region region = selector.getRegion();
|
Region region = selector.getRegion();
|
||||||
@ -348,7 +348,7 @@ public class WorldEditPlugin extends CommonPlugin implements Named {
|
|||||||
|
|
||||||
LocalSession session = controller.getSession(wrapPlayer(player));
|
LocalSession session = controller.getSession(wrapPlayer(player));
|
||||||
RegionSelector sel = selection.getRegionSelector();
|
RegionSelector sel = selection.getRegionSelector();
|
||||||
session.setRegionSelector(SpoutUtil.getLocalWorld(player.getEntity().getTransform().getPosition().getWorld()), sel);
|
session.setRegionSelector(SpoutUtil.getLocalWorld(player.getEntity().getPoint().getWorld()), sel);
|
||||||
session.dispatchCUISelection(wrapPlayer(player));
|
session.dispatchCUISelection(wrapPlayer(player));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user