Skip to content

fix(HytaleRtpCommand): add correct fluid ids for isSafeLocation #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xoydev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(HytaleRtpCommand): add correct fluid ids for isSafeLocation #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 32 additions & 4 deletions src/main/java/com/eliteessentials/commands/hytale/HytaleRtpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,33 @@ private Integer findHighestSolidBlock(WorldChunk chunk, int x, int z, int minY)
}
return null;
}

// FluidId is 0 if the position is not a fluid
private enum FluidType {
UNKNOWN(-1, "Unknown Fluid"),
NONE(0, "No Fluid"),
WATER(2, "Water"),
TAR(3, "Tar"),
SLIME(4, "Slime"),
RED_SLIME(5, "Red Slime"),
POISON(6, "Poison"),
FIRE(8, "Fire");

public final int id;
public final String name;

FluidType(int id, String name) {
this.id = id;
this.name = name;
}

public static FluidType fromId(int id) {
for(FluidType f : FluidType.values()) {
if(f.id == id) return f;
}
return UNKNOWN;
}
}

private boolean isSafeLocation(WorldChunk chunk, int x, int y, int z, boolean debug) {
try {
Expand All @@ -618,10 +645,11 @@ private boolean isSafeLocation(WorldChunk chunk, int x, int y, int z, boolean de
Object fluidIdObj = getFluidIdMethod.invoke(chunk, x, checkY, z);
if (fluidIdObj instanceof Integer) {
int fluidId = (Integer) fluidIdObj;
if (fluidId == 6 || fluidId == 7) {
if (fluidId != FluidType.NONE.id) {
if (debug) {
String fluidType = (fluidId == 6) ? "LAVA" : "WATER";
logger.info("[RTP-SAFETY] " + fluidType + " detected at Y" + (yOffset >= 0 ? "+" : "") + yOffset);
FluidType fluidType = FluidType.fromId(fluidId);
String fluidDebugText = fluidType != FluidType.UNKNOWN ? fluidType.name : fluidType.name + "(" + fluidId + ")";
logger.info("[RTP-SAFETY] " + fluidDebugText + " detected at Y" + (yOffset >= 0 ? "+" : "") + yOffset);
}
return false;
}
Expand All @@ -637,7 +665,7 @@ private boolean isSafeLocation(WorldChunk chunk, int x, int y, int z, boolean de
Object fluidIdObj = getFluidIdMethod.invoke(chunk, checkX, y, checkZ);
if (fluidIdObj instanceof Integer) {
int fluidId = (Integer) fluidIdObj;
if (fluidId == 6 || fluidId == 7) {
if (fluidId != FluidType.NONE.id) {
return false;
}
}
Expand Down