yuanzhe1999/MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-09 00:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quality of life netherportal fix (#1337)

Browse Source 
* Working New portal checks

fixed x axis portal with obsidian on z axis

* Removed Debug code

* Remove unnecessary code

removed PortalTile:: from PortalTile::validPortalFrame

* Remove more debug code
This commit is contained in:
Us3ful"-Dev
2026-04-03 22:01:48 +02:00
committed by GitHub
parent 8bf0343544
commit 103f38859a
2 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Minecraft.World/PortalTile.cpp
View File

@@ -67,21 +67,8 @@ bool PortalTile::isCubeShaped()
return false; return false;
} }
bool PortalTile::trySpawnPortal(Level *level, int x, int y, int z, bool actuallySpawn) bool PortalTile::validPortalFrame(Level* level, int x, int y, int z, int xd, int zd, bool actuallySpawn)
{ {
int xd = 0;
int zd = 0;
if (level->getTile(x - 1, y, z) == Tile::obsidian_Id || level->getTile(x + 1, y, z) == Tile::obsidian_Id) xd = 1;
if (level->getTile(x, y, z - 1) == Tile::obsidian_Id || level->getTile(x, y, z + 1) == Tile::obsidian_Id) zd = 1;
if (xd == zd) return false;
if (level->getTile(x - xd, y, z - zd) == 0)
{
x -= xd;
z -= zd;
}
for (int xx = -1; xx <= 2; xx++) for (int xx = -1; xx <= 2; xx++)
{ {
for (int yy = -1; yy <= 3; yy++) for (int yy = -1; yy <= 3; yy++)
@@ -101,9 +88,7 @@ bool PortalTile::trySpawnPortal(Level *level, int x, int y, int z, bool actually
} }
} }
} }
if (!actuallySpawn) return true;
if( !actuallySpawn )
return true;
for (int xx = 0; xx < 2; xx++) for (int xx = 0; xx < 2; xx++)
{ {
@@ -112,9 +97,52 @@ bool PortalTile::trySpawnPortal(Level *level, int x, int y, int z, bool actually
level->setTileAndData(x + xd * xx, y + yy, z + zd * xx, Tile::portalTile_Id, 0, Tile::UPDATE_CLIENTS); level->setTileAndData(x + xd * xx, y + yy, z + zd * xx, Tile::portalTile_Id, 0, Tile::UPDATE_CLIENTS);
} }
} }
return true; return true;
}
bool PortalTile::trySpawnPortal(Level *level, int x, int y, int z, bool actuallySpawn)
{
int xd = 0;
int zd = 0;
if (level->getTile(x - 1, y, z) == Tile::obsidian_Id || level->getTile(x + 1, y, z) == Tile::obsidian_Id) xd = 1;
if (level->getTile(x, y, z - 1) == Tile::obsidian_Id || level->getTile(x, y, z + 1) == Tile::obsidian_Id) zd = 1;
bool twoPosible = false; // two neth portals posible (x and z direction)
if (xd == zd)
{
if (xd == 1) twoPosible = true;
else return false;
}
bool changedx = false; // changed x so it can be reverted if two portals are posible
if (level->getTile(x - xd, y, z) == 0)
{
changedx = true;
x--;
}
else if (level->getTile(x, y, z - zd) == 0 && !twoPosible)
{
z--;
}
if (!twoPosible)
{
if (!validPortalFrame(level, x, y, z, xd, zd, actuallySpawn)) return false;
}
else
{
if (!validPortalFrame(level, x, y, z, xd, 0, actuallySpawn))
{
if (changedx) x++; // revert x (this check wants to check z not x and z)
if (level->getTile(x, y, z - zd) == 0) z--;
if (!validPortalFrame(level, x, y, z, 0, zd, actuallySpawn))
return false;
}
}
return true;
} }
void PortalTile::neighborChanged(Level *level, int x, int y, int z, int type) void PortalTile::neighborChanged(Level *level, int x, int y, int z, int type)

1
Minecraft.World/PortalTile.h
View File

@@ -13,6 +13,7 @@ public:
virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param
virtual bool isSolidRender(bool isServerLevel = false); virtual bool isSolidRender(bool isServerLevel = false);
virtual bool isCubeShaped(); virtual bool isCubeShaped();
virtual bool validPortalFrame(Level* level, int x, int y, int z, int xd, int zd, bool actuallySpawn);
virtual bool trySpawnPortal(Level *level, int x, int y, int z, bool actuallySpawn); virtual bool trySpawnPortal(Level *level, int x, int y, int z, bool actuallySpawn);
virtual void neighborChanged(Level *level, int x, int y, int z, int type); virtual void neighborChanged(Level *level, int x, int y, int z, int type);
virtual bool shouldRenderFace(LevelSource *level, int x, int y, int z, int face); virtual bool shouldRenderFace(LevelSource *level, int x, int y, int z, int face);