Treat 'Reference System.dll;' as 'Reference System.dll' for C# consis…

…tency
ClassiCube · May 7, 2020 · 2dee378 · 2dee378
1 parent b350727
commit 2dee378
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 10 deletions.
diff --git a/MCGalaxy/Blocks/BlockOptions.cs b/MCGalaxy/Blocks/BlockOptions.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
     
     Dual-licensed under the Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/Commands/CommandParser.cs b/MCGalaxy/Commands/CommandParser.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
 
     Dual-licensed under the Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/Commands/Maintenance/CmdPlayerEdit.cs b/MCGalaxy/Commands/Maintenance/CmdPlayerEdit.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
     
     Dual-licensed under the Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/Commands/Moderation/CmdLocation.cs b/MCGalaxy/Commands/Moderation/CmdLocation.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
 
     Dual-licensed under the    Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/Commands/World/CmdResizeLvl.cs b/MCGalaxy/Commands/World/CmdResizeLvl.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
         
     Dual-licensed under the Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/Commands/building/DrawCmd.cs b/MCGalaxy/Commands/building/DrawCmd.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
     
     Dual-licensed under the Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/CorePlugin/ConnectHandler.cs b/MCGalaxy/CorePlugin/ConnectHandler.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
         
     Dual-licensed under the Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/Levels/LevelEnv.cs b/MCGalaxy/Levels/LevelEnv.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
     
     Dual-licensed under the Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/Levels/LevelOptions.cs b/MCGalaxy/Levels/LevelOptions.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015 MCGalaxy team
+    Copyright 2015 MCGalaxy
     
     Dual-licensed under the Educational Community License, Version 2.0 and
     the GNU General Public License, Version 3 (the "Licenses"); you may

diff --git a/MCGalaxy/Scripting/Scripting.cs b/MCGalaxy/Scripting/Scripting.cs
@@ -135,7 +135,9 @@ public abstract class IScripting {
                 if (!lines[i].CaselessStarts("reference ")) break;
 
                 int index = lines[i].IndexOf(' ') + 1;
-                string assem = lines[i].Substring(index);
+                // For consistency with C#, treat 'Reference X.dll;' as 'Reference X.dll'
+                string assem = lines[i].Substring(index).Replace(";", "");
+
                 args.ReferencedAssemblies.Add(assem);
                 lines.RemoveAt(i);
                 offset++; i--;