summaryrefslogtreecommitdiffstats
path: root/src/Simulator/SimulatorManager.h
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-09-26 22:23:36 +0200
committerHowaner <franzi.moos@googlemail.com>2014-09-26 22:23:36 +0200
commitaf997a09ca1ff2bf3e93f9145edc50d29be28529 (patch)
tree8188753488f633407eea5aab0c9e6e0833300e43 /src/Simulator/SimulatorManager.h
parentFixed players custom name in 1.8 (diff)
parentMerge pull request #1455 from mc-server/includes (diff)
downloadcuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar
cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.gz
cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.bz2
cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.lz
cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.xz
cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.zst
cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.zip
Diffstat (limited to '')
-rw-r--r--src/Simulator/SimulatorManager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Simulator/SimulatorManager.h b/src/Simulator/SimulatorManager.h
index 31a709316..185141764 100644
--- a/src/Simulator/SimulatorManager.h
+++ b/src/Simulator/SimulatorManager.h
@@ -37,10 +37,10 @@ public:
void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk);
- void RegisterSimulator(cSimulator * a_Simulator, int a_Rate); // Takes ownership of the simulator object!
+ void RegisterSimulator(cSimulator<cChunk, cWorld> * a_Simulator, int a_Rate); // Takes ownership of the simulator object!
protected:
- typedef std::vector <std::pair<cSimulator *, int> > cSimulators;
+ typedef std::vector <std::pair<cSimulator<cChunk, cWorld> *, int> > cSimulators;
cWorld & m_World;
cSimulators m_Simulators;