AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-13 01:06:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix not compiling on .NET 2.0 due to using Func delegate in two places

Browse Source
This commit is contained in:
UnknownShadow200 2023-06-15 07:56:39 +10:00
parent 28843b10c4
commit c43b6fe3d9
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MCGalaxy/Database/PlayerDB.cs
View File

@ -144,7 +144,8 @@ namespace MCGalaxy.DB
} }
static List<T> MatchMulti<T>(string name, string columns, Func<ISqlRecord, T> parseRecord) where T : class { delegate T RecordParser<T>(ISqlRecord record);
static List<T> MatchMulti<T>(string name, string columns, RecordParser<T> parseRecord) where T : class {
List<T> list = FindPartial(name, columns, parseRecord); List<T> list = FindPartial(name, columns, parseRecord);
if (list.Count < 25) return list; if (list.Count < 25) return list;
@ -160,7 +161,7 @@ namespace MCGalaxy.DB
return list; return list;
} }
static List<T> FindPartial<T>(string name, string columns, Func<ISqlRecord, T> parseRecord) { static List<T> FindPartial<T>(string name, string columns, RecordParser<T> parseRecord) {
string suffix = Database.Backend.CaselessLikeSuffix; string suffix = Database.Backend.CaselessLikeSuffix;
List<T> list = new List<T>(); List<T> list = new List<T>();
@ -170,7 +171,7 @@ namespace MCGalaxy.DB
return list; return list;
} }
static T FindExact<T>(string name, string columns, Func<ISqlRecord, T> parseRecord) where T : class { static T FindExact<T>(string name, string columns, RecordParser<T> parseRecord) where T : class {
string suffix = Database.Backend.CaselessWhereSuffix; string suffix = Database.Backend.CaselessWhereSuffix;
T exact = null; T exact = null;

5
MCGalaxy/Generator/MapGen.cs
View File

@ -26,6 +26,7 @@ using MCGalaxy.Generator.Classic;
namespace MCGalaxy.Generator namespace MCGalaxy.Generator
{ {
public delegate bool MapGenFunc(Player p, Level lvl, MapGenArgs args); public delegate bool MapGenFunc(Player p, Level lvl, MapGenArgs args);
public delegate bool MapGenArgSelector(string arg);
public enum GenType { Simple, fCraft, Advanced }; public enum GenType { Simple, fCraft, Advanced };
public class MapGenArgs public class MapGenArgs
@ -35,8 +36,8 @@ namespace MCGalaxy.Generator
public MapGenBiomeName Biome; public MapGenBiomeName Biome;
public bool RandomDefault = true; public bool RandomDefault = true;
public Func<string, bool> ArgFilter = (Args) => false; public MapGenArgSelector ArgFilter = (Args) => false;
public Func<string, bool> ArgParser = null; public MapGenArgSelector ArgParser = null;
public bool ParseArgs(Player p) { public bool ParseArgs(Player p) {
bool gotSeed = false; bool gotSeed = false;

8
MCGalaxy/Modules/Relay/Discord/DiscordBot.cs
View File

@ -199,15 +199,15 @@ namespace MCGalaxy.Modules.Relay.Discord
OnReady(); OnReady();
} }
void PrintAttachments(JsonObject data, string channel) { void PrintAttachments(RelayUser user, JsonObject data, string channel) {
object raw; object raw;
if (!data.TryGetValue("attachments", out raw)) return; if (!data.TryGetValue("attachments", out raw)) return;
JsonArray list = raw as JsonArray; JsonArray list = raw as JsonArray;
if (list == null) return; if (list == null) return;
RelayUser user = ExtractUser(data);
foreach (object entry in list) { foreach (object entry in list)
{
JsonObject attachment = entry as JsonObject; JsonObject attachment = entry as JsonObject;
if (attachment == null) continue; if (attachment == null) continue;
@ -245,7 +245,7 @@ namespace MCGalaxy.Modules.Relay.Discord
HandleDirectMessage(user, channel, message); HandleDirectMessage(user, channel, message);
} else { } else {
HandleChannelMessage(user, channel, message); HandleChannelMessage(user, channel, message);
PrintAttachments(data, channel); PrintAttachments(user, data, channel);
} }
} }