Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed treasure chest weapon bug #969

Merged
merged 1 commit into from
Mar 11, 2013
Merged

fixed treasure chest weapon bug #969

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/nodes/weapon.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ end
-- Called when the weapon begins colliding with another node
-- @return nil
function Weapon:collide(node, dt, mtv_x, mtv_y)
if not node or self.dead or not self.player.wielding then return end
if not node or self.dead or (self.player and not self.player.wielding) then return end
if node.isPlayer then return end

if self.dropping and (node.isFloor or node.floorspace or node.isPlatform) then
Expand Down