summaryrefslogtreecommitdiffstats
path: root/src/Simulator/SimulatorManager.h
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-12-18 19:32:48 +0100
committerMasy98 <masy@antheruscraft.de>2014-12-18 19:32:48 +0100
commit706b9181e612410ea99c9d725d3cd448dafb152c (patch)
tree0d1281525b92566409a3c4a6d0bf8a0e9d5f7dc8 /src/Simulator/SimulatorManager.h
parentAdded Entity Guardian (diff)
parentMerge pull request #1679 from SphinxC0re/master (diff)
downloadcuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.gz
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.bz2
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.lz
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.xz
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.zst
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.zip
Diffstat (limited to 'src/Simulator/SimulatorManager.h')
-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 185141764..31a709316 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<cChunk, cWorld> * a_Simulator, int a_Rate); // Takes ownership of the simulator object!
+ void RegisterSimulator(cSimulator * a_Simulator, int a_Rate); // Takes ownership of the simulator object!
protected:
- typedef std::vector <std::pair<cSimulator<cChunk, cWorld> *, int> > cSimulators;
+ typedef std::vector <std::pair<cSimulator *, int> > cSimulators;
cWorld & m_World;
cSimulators m_Simulators;