2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-04 16:49:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@bitbucket.org:Major-/apollo.git.

Browse Source
This commit is contained in:
Ryley Kimmel
2015-03-03 21:19:06 -05:00
parent 6f95ba8d2e 040a460942
commit 25c13213e6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/plugins/navigation/door/door.rb
+1 -1
View File
@@ -18,7 +18,7 @@ class OpenDoorAction < DistancedAction
end
def equals(other)
return (get_class == other.get_class && @position == other.position)
return (get_class == other.get_class && @door_object == other.door_object)
end
end
data/plugins/navigation/door/util.rb
+1 -1
View File
@@ -88,7 +88,7 @@ module DoorUtil
# Gets the door object at the given position, if it exists.
def self.get_door_object(position, object_id)
game_objects = $world.sector_repository.from_position(position).get_entities(position, EntityType::GAME_OBJECT)
game_objects.each { |game_object| return game_object if game_object.get_id == object_id }
game_objects.each { |game_object| return game_object if game_object.id == object_id }
return nil
end