mirror of
https://github.com/Minecraft-Community-Edition/client.git
synced 2026-05-31 05:26:05 +00:00
reimplement aether stuff from personal repo
This commit is contained in:
@@ -126,7 +126,7 @@ Minecraft::Minecraft(Component *mouseComponent, Canvas *parent, MinecraftApplet
|
||||
timer = new Timer(SharedConstants::TICKS_PER_SECOND);
|
||||
oldLevel = NULL; //4J Stu added
|
||||
level = NULL;
|
||||
levels = MultiPlayerLevelArray(3); // 4J Added
|
||||
levels = MultiPlayerLevelArray(4); // 4J Added
|
||||
levelRenderer = NULL;
|
||||
player = nullptr;
|
||||
cameraTargetPlayer = nullptr;
|
||||
@@ -3939,6 +3939,7 @@ MultiPlayerLevel *Minecraft::getLevel(int dimension)
|
||||
{
|
||||
if (dimension == -1) return levels[1];
|
||||
else if(dimension == 1) return levels[2];
|
||||
else if(dimension == 2) return levels[3];
|
||||
else return levels[0];
|
||||
}
|
||||
|
||||
@@ -3960,6 +3961,7 @@ void Minecraft::forceaddLevel(MultiPlayerLevel *level)
|
||||
int dimId = level->dimension->id;
|
||||
if (dimId == -1) levels[1] = level;
|
||||
else if(dimId == 1) levels[2] = level;
|
||||
else if(dimId == 2) levels[3] = level;
|
||||
else levels[0] = level;
|
||||
}
|
||||
|
||||
@@ -4024,6 +4026,12 @@ void Minecraft::setLevel(MultiPlayerLevel *level, int message /*=-1*/, shared_pt
|
||||
delete levels[2];
|
||||
levels[2] = NULL;
|
||||
}
|
||||
if(levels[3]!=NULL)
|
||||
{
|
||||
levels[3]->savedDataStorage = NULL; // shared with overworld
|
||||
delete levels[3];
|
||||
levels[3] = NULL;
|
||||
}
|
||||
|
||||
// Delete all the player objects
|
||||
for(unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
|
||||
@@ -4065,6 +4073,7 @@ void Minecraft::setLevel(MultiPlayerLevel *level, int message /*=-1*/, shared_pt
|
||||
int dimId = level->dimension->id;
|
||||
if (dimId == -1) levels[1] = level;
|
||||
else if(dimId == 1) levels[2] = level;
|
||||
else if(dimId == 2) levels[3] = level;
|
||||
else levels[0] = level;
|
||||
|
||||
// If no player has been set, then this is the first level to be set this game, so set up
|
||||
@@ -5008,3 +5017,4 @@ int Minecraft::MustSignInReturnedPSN(void *pParam, int iPad, C4JStorage::EMessag
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user