mirror of
https://github.com/GabsPuNs/Project-Zenith-Main.git
synced 2026-05-27 13:14:37 +00:00
TU24
This commit is contained in:
@@ -159,11 +159,11 @@ NetherBridgePieces::NetherBridgePiece::NetherBridgePiece(int genDepth) : Structu
|
||||
{
|
||||
}
|
||||
|
||||
void NetherBridgePieces::NetherBridgePiece::readAdditonalSaveData(DataInputStream *dis)
|
||||
void NetherBridgePieces::NetherBridgePiece::readAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
}
|
||||
|
||||
void NetherBridgePieces::NetherBridgePiece::addAdditionalSaveData(DataOutputStream *dos)
|
||||
void NetherBridgePieces::NetherBridgePiece::addAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -497,18 +497,18 @@ bool NetherBridgePieces::BridgeEndFiller::postProcess(Level *level, Random *rand
|
||||
return true;
|
||||
}
|
||||
|
||||
void NetherBridgePieces::BridgeEndFiller::readAdditonalSaveData(DataInputStream *dis)
|
||||
void NetherBridgePieces::BridgeEndFiller::readAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
NetherBridgePiece::readAdditonalSaveData(dis);
|
||||
NetherBridgePiece::readAdditonalSaveData(tag);
|
||||
|
||||
selfSeed = dis->readInt();
|
||||
selfSeed = tag->getInt(L"Seed");
|
||||
}
|
||||
|
||||
void NetherBridgePieces::BridgeEndFiller::addAdditionalSaveData(DataOutputStream *dos)
|
||||
void NetherBridgePieces::BridgeEndFiller::addAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
NetherBridgePiece::addAdditionalSaveData(dos);
|
||||
NetherBridgePiece::addAdditonalSaveData(tag);
|
||||
|
||||
dos->writeInt(selfSeed);
|
||||
tag->putInt(L"Seed", selfSeed);
|
||||
}
|
||||
|
||||
NetherBridgePieces::BridgeCrossing::BridgeCrossing()
|
||||
@@ -636,14 +636,14 @@ NetherBridgePieces::StartPiece::StartPiece(Random *random, int west, int north,
|
||||
}
|
||||
}
|
||||
|
||||
void NetherBridgePieces::StartPiece::readAdditonalSaveData(DataInputStream *dis)
|
||||
void NetherBridgePieces::StartPiece::readAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
BridgeCrossing::readAdditonalSaveData(dis);
|
||||
BridgeCrossing::readAdditonalSaveData(tag);
|
||||
}
|
||||
|
||||
void NetherBridgePieces::StartPiece::addAdditionalSaveData(DataOutputStream *dos)
|
||||
void NetherBridgePieces::StartPiece::addAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
BridgeCrossing::addAdditionalSaveData(dos);
|
||||
BridgeCrossing::addAdditonalSaveData(tag);
|
||||
}
|
||||
|
||||
NetherBridgePieces::RoomCrossing::RoomCrossing()
|
||||
@@ -824,18 +824,18 @@ NetherBridgePieces::MonsterThrone *NetherBridgePieces::MonsterThrone::createPiec
|
||||
return new MonsterThrone(genDepth, random, box, direction);
|
||||
}
|
||||
|
||||
void NetherBridgePieces::MonsterThrone::readAdditonalSaveData(DataInputStream *dis)
|
||||
void NetherBridgePieces::MonsterThrone::readAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
NetherBridgePiece::readAdditonalSaveData(dis);
|
||||
NetherBridgePiece::readAdditonalSaveData(tag);
|
||||
|
||||
hasPlacedMobSpawner = dis->readBoolean();
|
||||
hasPlacedMobSpawner = tag->getBoolean(L"Mob");
|
||||
}
|
||||
|
||||
void NetherBridgePieces::MonsterThrone::addAdditionalSaveData(DataOutputStream *dos)
|
||||
void NetherBridgePieces::MonsterThrone::addAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
NetherBridgePiece::addAdditionalSaveData(dos);
|
||||
NetherBridgePiece::addAdditonalSaveData(tag);
|
||||
|
||||
dos->writeBoolean(hasPlacedMobSpawner);
|
||||
tag->putBoolean(L"Mob", hasPlacedMobSpawner);
|
||||
}
|
||||
|
||||
bool NetherBridgePieces::MonsterThrone::postProcess(Level *level, Random *random, BoundingBox *chunkBB)
|
||||
@@ -870,7 +870,6 @@ bool NetherBridgePieces::MonsterThrone::postProcess(Level *level, Random *random
|
||||
int y = getWorldY(5), x = getWorldX(3, 5), z = getWorldZ(3, 5);
|
||||
if (chunkBB->isInside(x, y, z))
|
||||
{
|
||||
setDirty();
|
||||
hasPlacedMobSpawner = true;
|
||||
level->setTileAndData(x, y, z, Tile::mobSpawner_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
shared_ptr<MobSpawnerTileEntity> entity = dynamic_pointer_cast<MobSpawnerTileEntity>( level->getTileEntity(x, y, z) );
|
||||
@@ -1322,18 +1321,18 @@ NetherBridgePieces::CastleSmallCorridorRightTurnPiece::CastleSmallCorridorRightT
|
||||
isNeedingChest = random->nextInt(3) == 0;
|
||||
}
|
||||
|
||||
void NetherBridgePieces::CastleSmallCorridorRightTurnPiece::readAdditonalSaveData(DataInputStream *dis)
|
||||
void NetherBridgePieces::CastleSmallCorridorRightTurnPiece::readAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
NetherBridgePiece::readAdditonalSaveData(dis);
|
||||
NetherBridgePiece::readAdditonalSaveData(tag);
|
||||
|
||||
isNeedingChest = dis->readBoolean();
|
||||
isNeedingChest = tag->getBoolean(L"Chest");
|
||||
}
|
||||
|
||||
void NetherBridgePieces::CastleSmallCorridorRightTurnPiece::addAdditionalSaveData(DataOutputStream *dos)
|
||||
void NetherBridgePieces::CastleSmallCorridorRightTurnPiece::addAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
NetherBridgePiece::addAdditionalSaveData(dos);
|
||||
NetherBridgePiece::addAdditonalSaveData(tag);
|
||||
|
||||
dos->writeBoolean(isNeedingChest);
|
||||
tag->putBoolean(L"Chest", isNeedingChest);
|
||||
}
|
||||
|
||||
void NetherBridgePieces::CastleSmallCorridorRightTurnPiece::addChildren(StructurePiece *startPiece, list<StructurePiece *> *pieces, Random *random)
|
||||
@@ -1381,7 +1380,6 @@ bool NetherBridgePieces::CastleSmallCorridorRightTurnPiece::postProcess(Level *l
|
||||
int x = getWorldX(1, 3), z = getWorldZ(1, 3);
|
||||
if (chunkBB->isInside(x, y, z))
|
||||
{
|
||||
setDirty();
|
||||
isNeedingChest = false;
|
||||
createChest(level, chunkBB, random, 1, 2, 3, WeighedTreasureArray(fortressTreasureItems,FORTRESS_TREASURE_ITEMS_COUNT), 2 + random->nextInt(4));
|
||||
}
|
||||
@@ -1415,18 +1413,18 @@ NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::CastleSmallCorridorLeftTur
|
||||
isNeedingChest = random->nextInt(3) == 0;
|
||||
}
|
||||
|
||||
void NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::readAdditonalSaveData(DataInputStream *dis)
|
||||
void NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::readAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
NetherBridgePiece::readAdditonalSaveData(dis);
|
||||
NetherBridgePiece::readAdditonalSaveData(tag);
|
||||
|
||||
isNeedingChest = dis->readBoolean();
|
||||
isNeedingChest = tag->getBoolean(L"Chest");
|
||||
}
|
||||
|
||||
void NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::addAdditionalSaveData(DataOutputStream *dos)
|
||||
void NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::addAdditonalSaveData(CompoundTag *tag)
|
||||
{
|
||||
NetherBridgePiece::addAdditionalSaveData(dos);
|
||||
NetherBridgePiece::addAdditonalSaveData(tag);
|
||||
|
||||
dos->writeBoolean(isNeedingChest);
|
||||
tag->putBoolean(L"Chest", isNeedingChest);
|
||||
}
|
||||
|
||||
void NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::addChildren(StructurePiece *startPiece, list<StructurePiece *> *pieces, Random *random)
|
||||
@@ -1474,7 +1472,6 @@ bool NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::postProcess(Level *le
|
||||
int x = getWorldX(3, 3), z = getWorldZ(3, 3);
|
||||
if (chunkBB->isInside(x, y, z))
|
||||
{
|
||||
setDirty();
|
||||
isNeedingChest = false;
|
||||
createChest(level, chunkBB, random, 3, 2, 3, WeighedTreasureArray(fortressTreasureItems,FORTRESS_TREASURE_ITEMS_COUNT), 2 + random->nextInt(4));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user