aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/EntityDamageSource.h
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/EntityDamageSource.h')
-rw-r--r--Minecraft.World/EntityDamageSource.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/EntityDamageSource.h b/Minecraft.World/EntityDamageSource.h
index bdbe36e7..a8a8ffbb 100644
--- a/Minecraft.World/EntityDamageSource.h
+++ b/Minecraft.World/EntityDamageSource.h
@@ -9,18 +9,18 @@ class Player;
class EntityDamageSource : public DamageSource
{
protected:
- shared_ptr<Entity> entity;
+ std::shared_ptr<Entity> entity;
public:
- //EntityDamageSource(const wstring &msgId, shared_ptr<Entity> entity);
- EntityDamageSource(ChatPacket::EChatPacketMessage msgId, shared_ptr<Entity> entity);
+ //EntityDamageSource(const wstring &msgId, std::shared_ptr<Entity> entity);
+ EntityDamageSource(ChatPacket::EChatPacketMessage msgId, std::shared_ptr<Entity> entity);
virtual ~EntityDamageSource() { }
- shared_ptr<Entity> getEntity();
+ std::shared_ptr<Entity> getEntity();
// 4J Stu - Made return a packet
- //virtual wstring getLocalizedDeathMessage(shared_ptr<Player> player);
- virtual shared_ptr<ChatPacket> getDeathMessagePacket(shared_ptr<Player> player);
+ //virtual wstring getLocalizedDeathMessage(std::shared_ptr<Player> player);
+ virtual std::shared_ptr<ChatPacket> getDeathMessagePacket(std::shared_ptr<Player> player);
virtual bool scalesWithDifficulty();
}; \ No newline at end of file