Skip to content

Commit 6a018c0

Browse files
Various fixes and improvements (#921)
2 parents 6c84ea3 + f71a9a2 commit 6a018c0

File tree

9 files changed

+21
-9
lines changed

9 files changed

+21
-9
lines changed

Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockBooleanDirectrix.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di
7070

7171
@Override
7272
public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {
73-
// No entering from the front, no entering from the back.
73+
// No entering from either of the output faces
7474
return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);
7575
}
7676

Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockEmptyDirectrix.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di
4343

4444
@Override
4545
public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {
46-
return true;
46+
// No entering from either of the output faces
47+
return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);
4748
}
4849

4950
@Override

Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockRedstoneDirectrix.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di
4646

4747
@Override
4848
public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {
49-
return true;
49+
// No entering from either of the output faces
50+
return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);
5051
}
5152

5253
@Override

Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/impetuses/BlockEntityRedstoneImpetus.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ public void updatePlayerProfile() {
6969
this.storedPlayerProfile = newProfile;
7070
this.setChanged();
7171
}
72-
} else {
73-
this.storedPlayerProfile = null;
7472
}
7573
}
7674

@@ -88,7 +86,11 @@ public ServerPlayer getStoredPlayer() {
8886
if (e instanceof ServerPlayer player) {
8987
return player;
9088
} else {
91-
HexAPI.LOGGER.error("Entity {} stored in a cleric impetus wasn't a player somehow", e);
89+
// if owner is offline then getEntity will return null
90+
// if e is somehow neither null nor a player, something is very wrong
91+
if (e != null) {
92+
HexAPI.LOGGER.error("Entity {} stored in a cleric impetus wasn't a player somehow", e);
93+
}
9294
return null;
9395
}
9496
}

Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,14 @@
382382
"": "Greater Teleport Splats Items",
383383
"@Tooltip": "Whether items should fly out of the player's inventory when using Greater Teleport"
384384
},
385+
doesTrueNameHaveAmbit: {
386+
"": "Does True Name Have Ambit",
387+
"@Tooltip": "Whether True Names (ie entity references to a player) should allow targeting the referenced player even outside of normal ambit",
388+
},
389+
tpDimDenylist: {
390+
"": "Teleport Dimension Deny List",
391+
"@Tooltip": "Resource locations of dimensions where teleportation is not allowed",
392+
},
385393
villagersOffendedByMindMurder: {
386394
"": "Villagers Offended By Mind Murder",
387395
"@Tooltip": "Whether villagers should be angry at the player when other villagers are mindflayed",
@@ -803,7 +811,7 @@
803811
arcsin: "Inverse Sine Purification",
804812
arccos: "Inverse Cosine Purification",
805813
arctan: "Inverse Tangent Purification",
806-
arctan2: "Inverse Tangent Purification II",
814+
arctan2: "Inverse Tangent Distillation",
807815
random: "Entropy Reflection",
808816
logarithm: "Logarithmic Distillation",
809817
coerce_axial: "Axial Purification",
@@ -934,7 +942,7 @@
934942
arcsin: "Inverse Sine Prfn.",
935943
arccos: "Inverse Cosine Prfn.",
936944
arctan: "Inverse Tangent Prfn.",
937-
arctan2: "Inverse Tan. Prfn. II",
945+
arctan2: "Inverse Tangent Dstl.",
938946

939947
"const/vec/": {
940948
x: "Vector Rfln. +X/-X",
@@ -1038,9 +1046,9 @@
10381046

10391047
entity: {
10401048
"": "an entity",
1049+
mob: "a mob",
10411050
item: "an item entity",
10421051
player: "a player",
1043-
villager: "a villager",
10441052
living: "a living entity",
10451053
},
10461054

5.03 KB
Loading
5.03 KB
Loading
5.07 KB
Loading
5.12 KB
Loading

0 commit comments

Comments
 (0)