Rebase the MessageHandler, MessageHandlerChain and MessageHandlerChainSet

Rebased several other pieces of code
This commit is contained in:
atomicint
2015-03-29 12:52:55 -04:00
parent 7f345fffac
commit 654a1a6dfd
71 changed files with 452 additions and 457 deletions
+2 -2
View File
@@ -134,7 +134,7 @@ class ProspectingAction < DistancedAction
end
on :message, :first_object_action do |ctx, mob, message|
on :message, :first_object_action do |mob, message|
ore = ORES[message.id]
unless ore.nil?
@@ -142,7 +142,7 @@ on :message, :first_object_action do |ctx, mob, message|
end
end
on :message, :second_object_action do |ctx, mob, message|
on :message, :second_object_action do |mob, message|
ore = ORES[message.id]
if !ore.nil?