flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Reverted non-functional changes

Browse Source
This commit is contained in:
Tiger Wang
2015-03-05 21:21:39 +00:00
parent 3869f76cc2
commit f3da0cf1ae
5 changed files with 11 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Blocks/BlockBed.cpp
View File

@@ -1,13 +1,9 @@
#include "Globals.h"
#include "BlockBed.h"
#include "BroadcastInterface.h"
#include "Entities/../World.h"
#include "Entities/Player.h"
#include "WorldInterface.h"
@@ -127,7 +123,14 @@ void cBlockBedHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface
a_Player->SetIsInBed(true);
a_Player->SendMessageSuccess("Home position set successfully");
a_WorldInterface.ScheduleTask(20, cWorld::cTaskTryAwakeSleepingPlayers(Vector3i(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z), a_ChunkInterface));
cTimeFastForwardTester Tester;
if (a_WorldInterface.ForEachPlayer(Tester))
{
cPlayerBedStateUnsetter Unsetter(Vector3i(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z), a_ChunkInterface);
a_WorldInterface.ForEachPlayer(Unsetter);
a_WorldInterface.SetTimeOfDay(0);
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0x0b); // Clear the "occupied" bit of the bed's block
}
}
}
else

5
src/Blocks/WorldInterface.h
View File

@@ -11,7 +11,6 @@ typedef cItemCallback<cBlockEntity> cBlockEntityCallback;
class cMonster;
class cPlayer;
class cTask;
class cWorldInterface
@@ -60,8 +59,4 @@ public:
/** Wakes up the simulators for the specified block */
virtual void WakeUpSimulators(int a_BlockX, int a_BlockY, int a_BlockZ) = 0;
/** Queues a task onto the tick thread, with the specified delay.
The task object will be deleted once the task is finished */
virtual void ScheduleTask(int a_DelayTicks, cTask * a_Task) = 0;
};