Signed-off-by: yoyosource <yoyosource@nidido.de>
Dieser Commit ist enthalten in:
Ursprung
f149ccce93
Commit
070a58651b
@ -57,7 +57,7 @@ public class Detonator {
|
|||||||
REntityServer entities = new REntityServer();
|
REntityServer entities = new REntityServer();
|
||||||
entities.setCallback((player, rEntity, entityAction) -> {
|
entities.setCallback((player, rEntity, entityAction) -> {
|
||||||
Vector vector = new Vector(rEntity.getX(), rEntity.getY(), rEntity.getZ());
|
Vector vector = new Vector(rEntity.getX(), rEntity.getY(), rEntity.getZ());
|
||||||
DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()), player);
|
DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player);
|
||||||
DetonatorListener.HAS_UPDATED.add(player);
|
DetonatorListener.HAS_UPDATED.add(player);
|
||||||
});
|
});
|
||||||
entities.addPlayer(p);
|
entities.addPlayer(p);
|
||||||
|
@ -58,7 +58,7 @@ public class SimulatorCursor {
|
|||||||
List<SimulatorElement> elements = tntSimulator.getEntity(result.getHitEntity());
|
List<SimulatorElement> elements = tntSimulator.getEntity(result.getHitEntity());
|
||||||
|
|
||||||
cursor = new REntityServer();
|
cursor = new REntityServer();
|
||||||
RFallingBlockEntity entity = new RFallingBlockEntity(cursor, (elements.isEmpty() ? getPos(player, result) : elements.get(0).getPosition()).toLocation(WORLD), Material.WHITE_STAINED_GLASS);
|
RFallingBlockEntity entity = new RFallingBlockEntity(cursor, (elements.isEmpty() ? getPos(player, result) : elements.get(0).getPosition()).toLocation(WORLD), Material.TNT);
|
||||||
entity.setNoGravity(true);
|
entity.setNoGravity(true);
|
||||||
entity.setGlowing(true);
|
entity.setGlowing(true);
|
||||||
cursor.addPlayer(player);
|
cursor.addPlayer(player);
|
||||||
|
@ -126,7 +126,11 @@ public class TNTElementGUI {
|
|||||||
|
|
||||||
Runnable editObserver = () -> {
|
Runnable editObserver = () -> {
|
||||||
ChangePosition.show(inv, player, tntElement, vectorUnaryOperator -> {
|
ChangePosition.show(inv, player, tntElement, vectorUnaryOperator -> {
|
||||||
tntElement.setPosition(vectorUnaryOperator.apply(tntElement.getPosition()).subtract(tntElement.getParent().getPosition()));
|
if (tntElement.getParent() == null) {
|
||||||
|
tntElement.setPosition(vectorUnaryOperator.apply(tntElement.getPosition()));
|
||||||
|
} else {
|
||||||
|
tntElement.setPosition(vectorUnaryOperator.apply(tntElement.getPosition()).subtract(tntElement.getParent().getPosition()));
|
||||||
|
}
|
||||||
}, () -> editLocation(player, tntElement, back));
|
}, () -> editLocation(player, tntElement, back));
|
||||||
|
|
||||||
// Alignment
|
// Alignment
|
||||||
|
@ -120,10 +120,10 @@ public class TNTGroupEditGUI {
|
|||||||
for (SimulatorElement element : simulatorElements) {
|
for (SimulatorElement element : simulatorElements) {
|
||||||
if (element instanceof TNTGroup) {
|
if (element instanceof TNTGroup) {
|
||||||
TNTGroup group = (TNTGroup) element;
|
TNTGroup group = (TNTGroup) element;
|
||||||
group.getPosition().add(vector);
|
group.setPosition(group.getPosition().add(vector));
|
||||||
} else if (element instanceof TNTElement) {
|
} else if (element instanceof TNTElement) {
|
||||||
TNTElement tntElement = (TNTElement) element;
|
TNTElement tntElement = (TNTElement) element;
|
||||||
tntElement.getOwnPosition().add(vector);
|
tntElement.setPosition(tntElement.getOwnPosition().add(vector));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -206,10 +206,10 @@ public class TNTSimulatorGui {
|
|||||||
for (SimulatorElement element : tntSimulator.getTntElementList()) {
|
for (SimulatorElement element : tntSimulator.getTntElementList()) {
|
||||||
if (element instanceof TNTGroup) {
|
if (element instanceof TNTGroup) {
|
||||||
TNTGroup group = (TNTGroup) element;
|
TNTGroup group = (TNTGroup) element;
|
||||||
group.getPosition().add(vector);
|
group.setPosition(group.getPosition().add(vector));
|
||||||
} else if (element instanceof TNTElement) {
|
} else if (element instanceof TNTElement) {
|
||||||
TNTElement tntElement = (TNTElement) element;
|
TNTElement tntElement = (TNTElement) element;
|
||||||
tntElement.getOwnPosition().add(vector);
|
tntElement.setPosition(tntElement.getOwnPosition().add(vector));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
SteamWar? Unbekannter Befehl.
|
Unbekannter Befehl.
|
||||||
moved too quickly!
|
moved too quickly!
|
In neuem Issue referenzieren
Einen Benutzer sperren