Merge branch 'general-devel' of https://github.com/Pryaxis/TShock into general-devel

.all-contributorsrc

@@ -77,6 +77,15 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "Retrograde-i486",
+      "name": "Retrograde-i486",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/65242258?v=4",
+      "profile": "https://github.com/Retrograde-i486",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

CHANGELOG.md

@@ -2,9 +2,10 @@
 
 This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
 
-## Upcoming changes
+## TShock 4.4.0 (Pre-release 4)
 * Debug logging now provides ConsoleDebug and ILog has been updated to support the concept of debug logs. Debug logs are now controlled by `config.json` instead of by preprocessor debug flag. (@hakusaro)
 * Removed `/confuse` command and Terraria player data resync from @Zidonuke. (@hakusaro)
+* Attempted to fix the player desync issue by changing `LastNetPosition` logic and disabling a check in Bouncer that would normally reject player update packets from players. (@QuiCM, @hakusaro)
 
 ## TShock 4.4.0 (Pre-release 3)
 * Fixed `/worldmode` command to correctly target world mode. (@Ristellise)

README.md

@@ -264,6 +264,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://www.nathaneaston.com/"><img src="https://avatars2.githubusercontent.com/u/10368650?v=4" width="100px;" alt=""/><br /><sub><b>Nathan Easton</b></sub></a><br /><a href="https://github.com/Pryaxis/TShock/commits?author=ndragon798" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Ristellise"><img src="https://avatars2.githubusercontent.com/u/7894419?v=4" width="100px;" alt=""/><br /><sub><b>Shinon</b></sub></a><br /><a href="https://github.com/Pryaxis/TShock/commits?author=Ristellise" title="Tests">⚠️</a> <a href="https://github.com/Pryaxis/TShock/commits?author=Ristellise" title="Code">💻</a> <a href="https://github.com/Pryaxis/TShock/commits?author=Ristellise" title="Documentation">📖</a></td>
   </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Retrograde-i486"><img src="https://avatars1.githubusercontent.com/u/65242258?v=4" width="100px;" alt=""/><br /><sub><b>Retrograde-i486</b></sub></a><br /><a href="https://github.com/Pryaxis/TShock/commits?author=Retrograde-i486" title="Code">💻</a></td>
+  </tr>
 </table>
 
 <!-- markdownlint-enable -->

README_cn.md

@@ -80,6 +80,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://www.nathaneaston.com/"><img src="https://avatars2.githubusercontent.com/u/10368650?v=4" width="100px;" alt=""/><br /><sub><b>Nathan Easton</b></sub></a><br /><a href="https://github.com/Pryaxis/TShock/commits?author=ndragon798" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Ristellise"><img src="https://avatars2.githubusercontent.com/u/7894419?v=4" width="100px;" alt=""/><br /><sub><b>Shinon</b></sub></a><br /><a href="https://github.com/Pryaxis/TShock/commits?author=Ristellise" title="Tests">⚠️</a> <a href="https://github.com/Pryaxis/TShock/commits?author=Ristellise" title="Code">💻</a> <a href="https://github.com/Pryaxis/TShock/commits?author=Ristellise" title="Documentation">📖</a></td>
   </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Retrograde-i486"><img src="https://avatars1.githubusercontent.com/u/65242258?v=4" width="100px;" alt=""/><br /><sub><b>Retrograde-i486</b></sub></a><br /><a href="https://github.com/Pryaxis/TShock/commits?author=Retrograde-i486" title="Code">💻</a></td>
+  </tr>
 </table>
 
 <!-- markdownlint-enable -->

TShockAPI/Bouncer.cs

@@ -122,9 +122,9 @@ namespace TShockAPI
 
 			if (args.Player.LastNetPosition == Vector2.Zero)
 			{
-				TShock.Log.ConsoleDebug("Bouncer / OnPlayerUpdate rejected from (last network position) {0}", args.Player.Name);
+				TShock.Log.ConsoleInfo("Bouncer / OnPlayerUpdate *would have rejected* from (last network position zero) {0}", args.Player.Name);
-				args.Handled = true;
+				// args.Handled = true;
-				return;
+				// return;
 			}
 
 			if (!pos.Equals(args.Player.LastNetPosition))
@@ -184,6 +184,7 @@ namespace TShockAPI
 				}
 			}
 
+			args.Player.LastNetPosition = pos;
 			return;
 		}
 

TShockAPI/Commands.cs

@@ -5012,7 +5012,7 @@ namespace TShockAPI
 				args.Player.SendSuccessMessage("Your new account has been verified, and the {0}setup system has been turned off.", Specifier);
 				args.Player.SendSuccessMessage("You can always use the {0}user command to manage players.", Specifier);
 				args.Player.SendSuccessMessage("The setup system will remain disabled as long as a superadmin exists (even if you delete setup.lock).");
-				args.Player.SendSuccessMessage("Share your server, talk with other admins, and more on our forums -- https://tshock.co/");
+				args.Player.SendSuccessMessage("Share your server, talk with other admins, and more on GitHub! -- https://tshock.co/");
 				args.Player.SendSuccessMessage("Thank you for using TShock for Terraria!");
 				FileTools.CreateFile(Path.Combine(TShock.SavePath, "setup.lock"));
 				File.Delete(Path.Combine(TShock.SavePath, "setup-code.txt"));

TShockAPI/SqlLog.cs

@@ -211,8 +211,11 @@ namespace TShockAPI
 		/// <param name="message">The message to be written.</param>
 		public void ConsoleDebug(string message)
 		{
-			Console.WriteLine("Debug: " + message);
+			if (TShock.Config.DebugLogs)
-			Write(message, TraceLevel.Verbose);
+			{
+				Console.WriteLine("Debug: " + message);
+				Write(message, TraceLevel.Verbose);
+			}
 		}
 
 		/// <summary>

TShockAPI/TextLog.cs

@@ -178,8 +178,11 @@ namespace TShockAPI
 		/// <param name="message">The message to be written.</param>
 		public void ConsoleDebug(string message)
 		{
-			Console.WriteLine("Debug: " + message);
+			if (TShock.Config.DebugLogs)
-			Write(message, TraceLevel.Verbose);
+			{
+				Console.WriteLine("Debug: " + message);
+				Write(message, TraceLevel.Verbose);
+			}
 		}
 
 		/// <summary>