diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2017-04-01 20:27:15 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2017-04-01 20:27:15 +0200 |
| commit | 6b9771c587a762152c219f405c8147ab2692de59 (patch) | |
| tree | de090b949552eda2c97f035e9fc88b4e501f81ef | |
| parent | good (diff) | |
| parent | test (diff) | |
| download | cuberite-6b9771c587a762152c219f405c8147ab2692de59.tar cuberite-6b9771c587a762152c219f405c8147ab2692de59.tar.gz cuberite-6b9771c587a762152c219f405c8147ab2692de59.tar.bz2 cuberite-6b9771c587a762152c219f405c8147ab2692de59.tar.lz cuberite-6b9771c587a762152c219f405c8147ab2692de59.tar.xz cuberite-6b9771c587a762152c219f405c8147ab2692de59.tar.zst cuberite-6b9771c587a762152c219f405c8147ab2692de59.zip | |
| -rw-r--r-- | src/Entities/Pawn.cpp | 2 | ||||
| -rw-r--r-- | src/Entities/Pawn.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp index 809c51731..70c9c7131 100644 --- a/src/Entities/Pawn.cpp +++ b/src/Entities/Pawn.cpp @@ -27,7 +27,7 @@ cPawn::cPawn(eEntityType a_EntityType, double a_Width, double a_Height) : -cPawn::~cPawn() +bool cPawn::OnPreWorldTravel(cWorld & a_NewWorld) { UnsetAllTargeters(); return super::OnPreWorldTravel(a_NewWorld); diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h index f613196e1..e882e18f7 100644 --- a/src/Entities/Pawn.h +++ b/src/Entities/Pawn.h @@ -22,8 +22,13 @@ public: CLASS_PROTODEF(cPawn) cPawn(eEntityType a_EntityType, double a_Width, double a_Height); +<<<<<<< HEAD ~cPawn(); +======= + + virtual bool OnPreWorldTravel(cWorld & a_NewWorld) override; +>>>>>>> origin/fixes virtual void Destroyed() override; virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; |