From 9ea080319c4a1007a12986c548fe82bd0ab59825 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Thu, 7 Apr 2016 19:39:27 +1000
Subject: [PATCH] Make /rp rainbow not be quite so laggy, also blocks such as
 'wactive_water' now also alias to 'activewater' (thanks goodlyay).

---
 Blocks/Block.CoreProps.cs          | 4 +++-
 Levels/Physics/ExtraInfoPhysics.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Blocks/Block.CoreProps.cs b/Blocks/Block.CoreProps.cs
index e824ee617..9542ac5d2 100644
--- a/Blocks/Block.CoreProps.cs
+++ b/Blocks/Block.CoreProps.cs
@@ -107,7 +107,9 @@ namespace MCGalaxy {
             for (int i = 0; i < names.Length; i++) {
                 Properties[i].Name = names[i];
                 if (names[i] != "unknown") 
-                    Aliases[names[i]] = (byte)i;
+                    Aliases[names[i]] = (byte)i;               
+                if (names[i].IndexOf('_') >= 0)
+                	Aliases[names[i].Replace("_", "")] = (byte)i;
             }
             
             // Add old MCGalaxy aliases
diff --git a/Levels/Physics/ExtraInfoPhysics.cs b/Levels/Physics/ExtraInfoPhysics.cs
index 4a05e306e..6f378ae40 100644
--- a/Levels/Physics/ExtraInfoPhysics.cs
+++ b/Levels/Physics/ExtraInfoPhysics.cs
@@ -179,7 +179,7 @@ namespace MCGalaxy.BlockPhysics {
             if (rainbownum > 2) {
                 byte block = lvl.blocks[C.b];
                 if (block < Block.red || block > Block.darkpink) {
-                    lvl.AddUpdate(C.b, Block.red, true, C.data);
+                    lvl.AddUpdate(C.b, Block.red, false, C.data);
                 } else {
                     byte next = block == Block.darkpink ? Block.red : (byte)(block + 1);
                     lvl.AddUpdate(C.b, next);