Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di

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

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di

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

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ public void updatePlayerProfile() {
this.storedPlayerProfile = newProfile;
this.setChanged();
}
} else {
this.storedPlayerProfile = null;
}
}

Expand All @@ -88,7 +86,11 @@ public ServerPlayer getStoredPlayer() {
if (e instanceof ServerPlayer player) {
return player;
} else {
HexAPI.LOGGER.error("Entity {} stored in a cleric impetus wasn't a player somehow", e);
// if owner is offline then getEntity will return null
// if e is somehow neither null nor a player, something is very wrong
if (e != null) {
HexAPI.LOGGER.error("Entity {} stored in a cleric impetus wasn't a player somehow", e);
}
return null;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,14 @@
"": "Greater Teleport Splats Items",
"@Tooltip": "Whether items should fly out of the player's inventory when using Greater Teleport"
},
doesTrueNameHaveAmbit: {
"": "Does True Name Have Ambit",
"@Tooltip": "Whether True Names (ie entity references to a player) should allow targeting the referenced player even outside of normal ambit",
},
tpDimDenylist: {
"": "Teleport Dimension Deny List",
"@Tooltip": "Resource locations of dimensions where teleportation is not allowed",
},
villagersOffendedByMindMurder: {
"": "Villagers Offended By Mind Murder",
"@Tooltip": "Whether villagers should be angry at the player when other villagers are mindflayed",
Expand Down Expand Up @@ -802,7 +810,7 @@
arcsin: "Inverse Sine Purification",
arccos: "Inverse Cosine Purification",
arctan: "Inverse Tangent Purification",
arctan2: "Inverse Tangent Purification II",
arctan2: "Inverse Tangent Distillation",
random: "Entropy Reflection",
logarithm: "Logarithmic Distillation",
coerce_axial: "Axial Purification",
Expand Down Expand Up @@ -933,7 +941,7 @@
arcsin: "Inverse Sine Prfn.",
arccos: "Inverse Cosine Prfn.",
arctan: "Inverse Tangent Prfn.",
arctan2: "Inverse Tan. Prfn. II",
arctan2: "Inverse Tangent Dstl.",

"const/vec/": {
x: "Vector Rfln. +X/-X",
Expand Down Expand Up @@ -1037,9 +1045,9 @@

entity: {
"": "an entity",
mob: "a mob",
item: "an item entity",
player: "a player",
villager: "a villager",
living: "a living entity",
},

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading