Thank you, but I can only take credit for the changes I made since posting this resource. Everything before it was Djeryv's efforts. Some of the changes I did make were errors found by others, and some of them already had a fix so I would implement those. Like the saw mills and boat sailing crashes.
I know. I'm Nephtan from the reddit posts. The updates and fixes you've made are wonderful. I've been comparing it to the last R&R update and also to my own changes and will be merging in a lot of your work. I really appreciate it!
I don't have a Reddit account, but I do read the stuff there to see if people find problems or have ideas. Someone posted that they wanted to make some buff icons so I went ahead and did as many icons as I could find effects for in the game. If you decide to grab that, it will be a little bit laborious. You have to grab the Gump IDs that I created/set. Then you have to grab the Cliloc entries I added. Lastly, all of the places in scripts where I call a buff icon to appear.
Thanks for those tips. I haven't made any of my own changes to many of those files so it's pretty easy for me to merge them in, it's just a lot to go through.
I try not to look too much these days. Face forward, find what I need, and get out.
Which one(s)? I have been to an ankh, ancient dryad, and buddha one and they display fine.
Shoot, I've seen two so I assumed it was all of them. I will note the locations as I see them again
Moon, Britain, and Montor so far. maybe its just the ones in the cities?
same deal, I may have tweaked something by doing the pause thing. It still works, and I only noticed by accident. could be just me
That did the trick, I'll try to be more detailed when or if I find anything else out of place
Well, I could also keep my updates straight too. Thanks for trying the reupload.
No problem, I’m fairly invested in your build. I think it’s the best single-player experience in its niche
System.dll
System.Web.dll
System.Xml.dll
System.Data.dll
System.Drawing.dll
System.Windows.Forms.dll
System.Core.dll#region References
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
using System.Net.Sockets;
using System.Text.RegularExpressions;
using System.Xml;
using Server.Network;
#endregion
namespace Server.Misc
{
public class ServerList
{
/*
* The default setting for Address, a value of 'null', will use your local IP address. If all of your local IP addresses
* are private network addresses and AutoDetect is 'true' then ServUO will attempt to discover your public IP address
* for you automatically.
*
* If you do not plan on allowing clients outside of your LAN to connect, you can set AutoDetect to 'false' and leave
* Address set to 'null'.
*
* If your public IP address cannot be determined, you must change the value of Address to your public IP address
* manually to allow clients outside of your LAN to connect to your server. Address can be either an IP address or
* a hostname that will be resolved when ServUO starts.
*
* If you want players outside your LAN to be able to connect to your server and you are behind a router, you must also
* forward TCP port 2593 to your private IP address. The procedure for doing this varies by manufacturer but generally
* involves configuration of the router through your web browser.
*
* ServerList will direct connecting clients depending on both the address they are connecting from and the address and
* port they are connecting to. If it is determined that both ends of a connection are private IP addresses, ServerList
* will direct the client to the local private IP address. If a client is connecting to a local public IP address, they
* will be directed to whichever address and port they initially connected to. This allows multihomed servers to function
* properly and fully supports listening on multiple ports. If a client with a public IP address is connecting to a
* locally private address, the server will direct the client to either the AutoDetected IP address or the manually entered
* IP address or hostname, whichever is applicable. Loopback clients will be directed to loopback.
*
* If you would like to listen on additional ports (i.e. 22, 23, 80, for clients behind highly restrictive egress
* firewalls) or specific IP adddresses you can do so by modifying the file SocketOptions.cs found in this directory.
*/
// For R&R, put the file in the Info dir, with the other settings files
private static readonly string m_AddressMapConfigPath = Path.Combine("Info", "ServerListMap.xml");
// Triple of CIDR pattern (IPAddress/Length) to server listing address
private static List<(IPAddress, int, IPAddress)> _AddressMap = new List<(IPAddress, int, IPAddress)>();
// DEFAULT: public static readonly string Address = Config.Get("Server.Address", default(string));
public static readonly string Address = null;
// DEFAULT: public static readonly bool AutoDetect = Config.Get("Server.AutoDetect", true);
public static readonly bool AutoDetect = false;
public static string ServerName = MyServerSettings.ServerName();
private static IPAddress _PublicAddress;
private static readonly Regex _AddressPattern = new Regex(@"([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})");
public static void Initialize()
{
LoadAddressMap(m_AddressMapConfigPath);
if (Address == null)
{
if (AutoDetect)
{
AutoDetection();
}
}
else
{
Resolve(Address, out _PublicAddress);
}
EventSink.ServerList += EventSink_ServerList;
}
private static void LoadAddressMap(string ConfigFile)
{
if (!File.Exists(ConfigFile)) {
Console.WriteLine("ServerListMap: Not present @ {0}", ConfigFile);
return;
}
XmlDocument doc = new XmlDocument();
doc.Load(ConfigFile);
foreach (XmlNode node in doc.GetElementsByTagName("serverListMap")[0].ChildNodes)
{
if (node.Name.Equals("entry") && node.Attributes["cidrmatch"] != null && node.Attributes["destination"] != null)
{
var cidrmatch = node.Attributes["cidrmatch"].Value;
// This uses the added function at the EOF.
TryParseCIDR(cidrmatch, out var cidrAddress, out var cidrLength);
IPAddress net;
try
{
IPAddress.TryParse(cidrmatch, out net);
}
catch
{
Console.WriteLine("ServerListMap: Invalid CIDR {0} - XML: {1}", cidrmatch, node.OuterXml);
continue;
}
var destination = node.Attributes["destination"].Value;
IPAddress dest;
try
{
IPAddress.TryParse(destination, out dest);
}
catch
{
Console.WriteLine("ServerListMap: Invalid Destination {0} - XML: {1}", destination, node.OuterXml);
continue;
}
_AddressMap.Add((cidrAddress, cidrLength, dest));
Console.WriteLine("ServerListMap: {0} => {1}", cidrmatch, dest);
}
else if (node.NodeType != XmlNodeType.Comment)
Console.WriteLine("ServerListMap: XML does not match required specification - {0}", node.OuterXml);
}
}
private static void EventSink_ServerList(ServerListEventArgs e)
{
try
{
NetState ns = e.State;
Socket s = ns.Socket;
IPEndPoint ipep = (IPEndPoint)s.LocalEndPoint;
IPAddress localAddress = ipep.Address;
int localPort = ipep.Port;
IPEndPoint ipepRemote = (IPEndPoint)s.RemoteEndPoint;
if (IsPrivateNetwork(localAddress))
{
if (!IsPrivateNetwork(ipepRemote.Address) && _PublicAddress != null)
{
localAddress = _PublicAddress;
}
}
// ServerListMap matches
// NOTE: original - foreach (var (address, length, destination) in _AddressMap)
// This form of tuple deconstruction does not appear to work due to Mono/.NET version used here.
foreach (var i in _AddressMap)
{
// Pull data from our Tuple due to the lack of nicer foreach deconstruction
var address = i.Item1;
var length = i.Item2;
var destination = i.Item3;
if (Utility.IPMatchCIDR(address, ipepRemote.Address, length))
{
localAddress = destination;
break;
}
}
e.AddServer(ServerName, new IPEndPoint(localAddress, localPort));
}
catch
{
e.Rejected = true;
}
}
public static string[] IPServices =
{
"http://services.servuo.com/ip.php", "http://api.ipify.org",
"http://checkip.dyndns.org/"
};
private static void AutoDetection()
{
if (!HasPublicIPAddress())
{
Utility.PushColor(ConsoleColor.Yellow);
Console.WriteLine("ServerList: Auto-detecting public IP address...");
_PublicAddress = FindPublicAddress(IPServices);
if (_PublicAddress != null)
{
Console.WriteLine("ServerList: Done: '{0}'", _PublicAddress);
}
else
{
_PublicAddress = IPAddress.Any;
Console.WriteLine("ServerList: Failed: reverting to private IP address...");
}
Utility.PopColor();
}
}
private static void Resolve(string addr, out IPAddress outValue)
{
if (IPAddress.TryParse(addr, out outValue))
{
return;
}
try
{
IPHostEntry iphe = Dns.GetHostEntry(addr);
if (iphe.AddressList.Length > 0)
{
outValue = iphe.AddressList[iphe.AddressList.Length - 1];
}
}
catch(Exception e)
{
// Diagnostics.ExceptionLogging.LogException(e);
Console.WriteLine(e);
}
}
private static bool HasPublicIPAddress()
{
NetworkInterface[] adapters = NetworkInterface.GetAllNetworkInterfaces();
System.Collections.Generic.IEnumerable<IPAddress> uips = adapters.Select(a => a.GetIPProperties())
.SelectMany(p => p.UnicastAddresses.Cast<IPAddressInformation>(), (p, u) => u.Address);
return
uips.Any(
ip => !IPAddress.IsLoopback(ip) && ip.AddressFamily != AddressFamily.InterNetworkV6 && !IsPrivateNetwork(ip));
}
private static bool IsPrivateNetwork(IPAddress ip)
{
// 10.0.0.0/8
// 172.16.0.0/12
// 192.168.0.0/16
// 169.254.0.0/16
// 100.64.0.0/10 RFC 6598
if (ip.AddressFamily == AddressFamily.InterNetworkV6)
{
return false;
}
if (Utility.IPMatch("192.168.*", ip))
{
return true;
}
if (Utility.IPMatch("10.*", ip))
{
return true;
}
if (Utility.IPMatch("172.16-31.*", ip))
{
return true;
}
if (Utility.IPMatch("169.254.*", ip))
{
return true;
}
if (Utility.IPMatch("100.64-127.*", ip))
{
return true;
}
return false;
}
public static IPAddress FindPublicAddress(params string[] services)
{
if (services == null || services.Length == 0)
{
services = IPServices;
}
if (services == null || services.Length == 0)
{
return null;
}
IPAddress ip = null;
Uri uri;
string data;
Match match;
foreach (string service in services.Where(s => !string.IsNullOrWhiteSpace(s)))
{
try
{
uri = new Uri(service);
Console.WriteLine("ServerList: >>> {0}", uri.Host);
using (WebClient client = new WebClient())
{
data = client.DownloadString(uri);
}
Console.WriteLine("ServerList: <<< {0}", data);
match = _AddressPattern.Match(data);
if (!match.Success || !IPAddress.TryParse(match.Value, out ip))
{
ip = null;
}
}
catch (UriFormatException)
{
Console.WriteLine("ServerList: Invalid IP service Uri '{0}'", service);
ip = null;
}
catch
{
}
if (ip != null)
{
break;
}
}
return ip;
}
//Added from the Utility file included with the patch
public static bool TryParseCIDR(string cidr, out IPAddress cidrAddress, out int length)
{
var cidrParts = cidr.Split('/');
try
{
IPAddress.TryParse(cidrParts[0], out cidrAddress);
Int32.TryParse(cidrParts[1], out length);
return true;
}
catch
{
cidrAddress = null;
length = 0;
return false;
}
}
}
}<?xml version="1.0" encoding="UTF-8"?>
<serverListMap>
<!-- entry elements define a remote cidr address match that maps to a destination
cidrmatch String IP CIDR to match against the remote address, such as 192.168.1.0/24
Input the containers address/network in CIDR format
destination String Destination IP to use if matched
Input the world accessible "physical" server IP address
-->
<!-- Example 1 - Single address match where NATing is insufficient / misconfigued (SSH tunnel + docker)
<entry cidrmatch="172.18.0.1/32" destination="127.0.0.1"/>
-->
<!-- Example 2 - Local network match where NAT'ing is insufficent / misconfigured (docker)
<entry cidrmatch="192.168.1.0/24" destination="192.168.1.100"/>
-->
<!-- Example 3 - Local network match where NAT'ing is insufficent / misconfigured (podman default network)
<entry cidrmatch="10.89.0.0/16" destination="192.168.1.100"/>
-->
</serverListMap>
Strange as the deserialize should have taken care of this but until I see this unmixed gold I can't really address it.
Never messed with that code and your description of the issue isn't really that clearly written.
For some reason, your online.txt file (in INFO dir) was locked and so the server crashed. I can maybe check into this and see if it has the same safety catch as the other txt files stored there.
I had the same issue, i dropped 2 type of currency. Checking with the admin account the only difference between the "gold" and "gold coin" is on the name properety of the item. The vendors and monster drops give the "gold coin" version of currency. So somewhere there is a piece of code that give the name "gold" to the currency. Im trying to replicate the issue again to check the "gold" one come from.
Try the attached.
Its the same gold.cs file i have. Ive noticed another thing, silver and copper get the plural notation, gold dont its always "gold coin". Dunno what u have modified, im just trying to giving u a clue
Ugh. It keeps grabbing an old file on upload.
Nice, now pots seems works fine. I've found another item, there are a version of "Crossbow bolt" named "Bolt", its not critical, u can use it anyway.
I will focus on this stuff this weekend. I will also go through TileData the best I can and try to fix any nuances I find along the way as well. Any others noted feel free to mention them.
I had the same issue, check if you turned on auto-run. Game has lifeguard vibes about it, no running lol