From b2eddbed84d55978337d1b52f6a9a2eabb658017 Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 8 Apr 2021 06:17:24 -0400 Subject: Teleport off of mount when throwing enderpearl (#5179) * Teleport off of mount when throwing enderpearl * Simplify returning boolean * Oops forgot a semicolon * Fix code conventions in Player.h --- src/Entities/Player.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Entities/Player.h') diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 5a17ca783..65dbfaed7 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -604,6 +604,7 @@ public: // cEntity overrides: virtual void AttachTo(cEntity * a_AttachTo) override; virtual void Detach(void) override; + virtual void Detach(bool a_IsTeleporting); virtual cItem GetEquippedWeapon(void) const override { return m_Inventory.GetEquippedItem(); } virtual cItem GetEquippedHelmet(void) const override { return m_Inventory.GetEquippedHelmet(); } virtual cItem GetEquippedChestplate(void) const override { return m_Inventory.GetEquippedChestplate(); } -- cgit v1.2.3