Skip to content

Commit 7d2e6b9

Browse files
committed
bump version, make ships load static, ships do circles when they don't have a target
1 parent e4aff5f commit 7d2e6b9

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ loader_version=0.15.10
1010
fabric_kotlin_version=1.10.19+kotlin.1.9.23
1111

1212
# Mod Properties
13-
mod_version=1.3.0
13+
mod_version=1.4.0
1414
maven_group=ace.actually.pirates
1515
archives_base_name=ValkyrienPirates
1616

src/main/java/ace/actually/pirates/blocks/entity/MotionInvokingBlockEntity.java

+3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public static void tick(World world, BlockPos pos, BlockState state, MotionInvok
5858
if(updateTicks==-1)
5959
{
6060
updateTicks = Integer.parseInt(ConfigUtils.config.getOrDefault("controlled-ship-updates","100"));
61+
6162
}
6263

6364
if (be.instructions.isEmpty() && world.getGameRules().getBoolean(Pirates.PIRATES_IS_LIVE_WORLD)) {
@@ -80,7 +81,9 @@ public static void tick(World world, BlockPos pos, BlockState state, MotionInvok
8081
ChunkPos chunkPos = world.getChunk(pos).getPos();
8182
LoadedServerShip ship = VSGameUtilsKt.getShipObjectManagingPos((ServerWorld) world, chunkPos);
8283

84+
8385
if (ship != null) {
86+
ship.setStatic(false);
8487
SeatedControllingPlayer seatedControllingPlayer = ship.getAttachment(SeatedControllingPlayer.class);
8588
if (seatedControllingPlayer == null) {
8689
if (world.getBlockState(pos.up()).getBlock() instanceof ShipHelmBlock) {

src/main/java/ace/actually/pirates/structures/ShipStructurePlacementHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void createShip (StructureTemplate structureTemplate, ServerWorld
6464
Pirates.LOGGER.info("template cleanup failed.");
6565
}
6666

67-
newShip.setStatic(false);
67+
6868
}
6969

7070
}

src/main/java/ace/actually/pirates/util/EurekaCompat.java

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ public class EurekaCompat {
1010
public static void moveTowards(MotionInvokingBlockEntity be, SeatedControllingPlayer power, LoadedServerShip ship)
1111
{
1212
if(be.getTarget().length!=3) return;
13+
if(be.getTarget()[0]==0 && be.getTarget()[1]==0 && be.getTarget()[2]==0)
14+
{
15+
power.setForwardImpulse(1);
16+
power.setLeftImpulse(1);
17+
return;
18+
}
1319

1420
power.setForwardImpulse(1);
1521
Vector3dc v3d = ship.getTransform().getPositionInWorld();

0 commit comments

Comments
 (0)