performed a stress test and fixed a couple resulting bugs

calyxrs · Apr 13, 2012 · 879f64a · 879f64a
1 parent 062660c
commit 879f64a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/lib/calyx/net/packetloader.rb b/lib/calyx/net/packetloader.rb
@@ -17,6 +17,8 @@ def Net.load_packets
     end
 
     def Net.handle_packet(player, packet)
+      return if !player
+
       if PACKETS.include?(packet.opcode)
         handler = PACKETS[packet.opcode]
 

diff --git a/lib/calyx/tasks/player_update.rb b/lib/calyx/tasks/player_update.rb
@@ -75,7 +75,7 @@ def execute
       WORLD.region_manager.get_local_players(@player).each {|p|
         # Make sure we have space and avoid duplicates
         break if @player.local_players.size >= 255
-        next if p.eql?(@player) || @player.local_players.include?(p)
+        next if p.index == nil || p.eql?(@player) || @player.local_players.include?(p)
 
         # Add and update the new player
         @player.local_players << p

diff --git a/lib/calyx/tasks/update_event.rb b/lib/calyx/tasks/update_event.rb
@@ -15,7 +15,7 @@ def execute
       }
 
       WORLD.players.each {|p|
-        # TODO check if the connection is inactive
+        next unless p.index
         ticks << PlayerTickTask.new(p)
         resets << PlayerResetTask.new(p)
         updates << PlayerUpdateTask.new(p)