diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-06-26 15:49:53 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-06-26 15:49:53 +0200 |
| commit | eaf36766f60662a0aa7829ae3d96f47fd91b408d (patch) | |
| tree | 3075c09f947dfbaff163c405c74f518a8064ea89 /src/Entities | |
| parent | derp (diff) | |
| parent | Merge pull request #1126 from mc-server/BlockInfoInit (diff) | |
| download | cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.gz cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.bz2 cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.lz cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.xz cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.zst cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Player.cpp | 1 | ||||
| -rw-r--r-- | src/Entities/ThrownSnowballEntity.cpp | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 978517086..7b4fd219d 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -146,6 +146,7 @@ cPlayer::~cPlayer(void) m_ClientHandle = NULL; delete m_InventoryWindow; + m_InventoryWindow = NULL; LOGD("Player %p deleted", this); } diff --git a/src/Entities/ThrownSnowballEntity.cpp b/src/Entities/ThrownSnowballEntity.cpp index 427f630f7..cefc3433c 100644 --- a/src/Entities/ThrownSnowballEntity.cpp +++ b/src/Entities/ThrownSnowballEntity.cpp @@ -36,10 +36,6 @@ void cThrownSnowballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & { TotalDamage = 3; } - else if (MobType == cMonster::mtEnderDragon) - { - TotalDamage = 1; - } } // TODO: If entity is Ender Crystal, destroy it a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1); |