diff --git a/.all-contributorsrc b/.all-contributorsrc
index 9ebc6ab5..f141644b 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -57,6 +57,26 @@
"doc",
"test"
]
+ },
+ {
+ "login": "ndragon798",
+ "name": "Nathan Easton",
+ "avatar_url": "https://avatars2.githubusercontent.com/u/10368650?v=4",
+ "profile": "http://www.nathaneaston.com/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Ristellise",
+ "name": "Shinon",
+ "avatar_url": "https://avatars2.githubusercontent.com/u/7894419?v=4",
+ "profile": "https://github.com/Ristellise",
+ "contributions": [
+ "test",
+ "code",
+ "doc"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88c853a3..b1b41e05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
## Upcoming changes
* 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)
## TShock 4.4.0 (Pre-release 3)
* Fixed `/worldmode` command to correctly target world mode. (@Ristellise)
diff --git a/README.md b/README.md
index 0cc1eb0e..257df430 100644
--- a/README.md
+++ b/README.md
@@ -261,6 +261,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Stargazing Koishi
💻 🚇 |
Axeel
📖 📆 |
Patrikkk
💻 📖 ⚠️ |
+ 
Nathan Easton
💻 |
+ 
Shinon
⚠️ 💻 📖 |
diff --git a/README_cn.md b/README_cn.md
index a824a2c5..7ede26da 100644
--- a/README_cn.md
+++ b/README_cn.md
@@ -77,6 +77,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Stargazing Koishi
💻 🚇 |
Axeel
📖 📆 |
Patrikkk
💻 📖 ⚠️ |
+
Nathan Easton
💻 |
+
Shinon
⚠️ 💻 📖 |
diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index ee84fc34..5d2c2912 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -337,10 +337,6 @@ namespace TShockAPI
{
HelpText = "Annoys a player for an amount of time."
});
- add(new Command(Permissions.annoy, Confuse, "confuse")
- {
- HelpText = "Confuses a player for an amount of time."
- });
add(new Command(Permissions.annoy, Rocket, "rocket")
{
HelpText = "Rockets a player upwards. Requires SSC."
@@ -5208,26 +5204,6 @@ namespace TShockAPI
}
}
- private static void Confuse(CommandArgs args)
- {
- if (args.Parameters.Count != 1)
- {
- args.Player.SendErrorMessage("Invalid syntax! Proper syntax: {0}confuse ", Specifier);
- return;
- }
- var players = TSPlayer.FindByNameOrID(args.Parameters[0]);
- if (players.Count == 0)
- args.Player.SendErrorMessage("Invalid player!");
- else if (players.Count > 1)
- args.Player.SendMultipleMatchError(players.Select(p => p.Name));
- else
- {
- var ply = players[0];
- ply.Confused = !ply.Confused;
- args.Player.SendSuccessMessage("{0} is {1} confused.", ply.Name, ply.Confused ? "now" : "no longer");
- }
- }
-
private static void Rocket(CommandArgs args)
{
if (args.Parameters.Count != 1)
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 9984669c..df94e7f1 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -2128,119 +2128,7 @@ namespace TShockAPI
if (OnPlayerUpdate(args.Player, args.Data, playerID, controls, miscData1, miscData2, miscData3, selectedItem, position, velocity, originalPosition, homePosition))
return true;
- if (controls.IsUsingItem)
- {
- // Reimplementation of normal Terraria stuff?
- if (args.TPlayer.inventory[selectedItem].Name == "Mana Crystal" && args.Player.TPlayer.statManaMax <= 180)
- {
- args.Player.TPlayer.statMana += 20;
- args.Player.TPlayer.statManaMax += 20;
- args.Player.PlayerData.maxMana += 20;
- }
- else if (args.TPlayer.inventory[selectedItem].Name == "Life Crystal" && args.Player.TPlayer.statLifeMax <= 380)
- {
- args.TPlayer.statLife += 20;
- args.TPlayer.statLifeMax += 20;
- args.Player.PlayerData.maxHealth += 20;
- }
- else if (args.TPlayer.inventory[selectedItem].Name == "Life Fruit" && args.Player.TPlayer.statLifeMax >= 400 && args.Player.TPlayer.statLifeMax <= 495)
- {
- args.TPlayer.statLife += 5;
- args.TPlayer.statLifeMax += 5;
- args.Player.PlayerData.maxHealth += 5;
- }
- }
-
- // Where we rebuild sync data for Terraria?
- args.TPlayer.selectedItem = selectedItem;
- args.TPlayer.position = position;
- args.TPlayer.oldVelocity = args.TPlayer.velocity;
- args.TPlayer.velocity = velocity;
- args.TPlayer.fallStart = (int)(position.Y / 16f);
- args.TPlayer.controlUp = false;
- args.TPlayer.controlDown = false;
- args.TPlayer.controlLeft = false;
- args.TPlayer.controlRight = false;
- args.TPlayer.controlJump = false;
- args.TPlayer.controlUseItem = false;
- args.TPlayer.pulley = miscData1.IsUsingPulley;
-
- if (miscData1.IsUsingPulley)
- args.TPlayer.pulleyDir = (byte)(miscData1.PulleyDirection ? 2 : 1);
-
- if (miscData1.IsVortexStealthActive)
- args.TPlayer.vortexStealthActive = true;
- else
- args.TPlayer.vortexStealthActive = false;
-
- args.TPlayer.gravDir = miscData1.GravityDirection ? 1f : -1f;
-
- args.TPlayer.direction = -1;
-
- if (controls.MoveUp)
- {
- args.TPlayer.controlUp = true;
- }
- if (controls.MoveDown)
- {
- args.TPlayer.controlDown = true;
- }
- if (controls.MoveLeft)
- {
- args.TPlayer.controlLeft = true;
- }
- if (controls.MoveRight)
- {
- args.TPlayer.controlRight = true;
- }
- if (controls.Jump)
- {
- args.TPlayer.controlJump = true;
- }
- if (controls.IsUsingItem)
- {
- args.TPlayer.controlUseItem = true;
- }
- if (controls.FaceDirection)
- {
- args.TPlayer.direction = 1;
- }
- else
- {
- args.TPlayer.direction = -1;
- }
-
- if (args.Player.Confused && Main.ServerSideCharacter && args.Player.IsLoggedIn)
- {
- if (args.TPlayer.controlUp)
- {
- args.TPlayer.controlDown = true;
- args.TPlayer.controlUp = false;
- }
- else if (args.TPlayer.controlDown)
- {
- args.TPlayer.controlDown = false;
- args.TPlayer.controlUp = true;
- }
-
- if (args.TPlayer.controlLeft)
- {
- args.TPlayer.controlRight = true;
- args.TPlayer.controlLeft = false;
- }
- else if (args.TPlayer.controlRight)
- {
- args.TPlayer.controlRight = false;
- args.TPlayer.controlLeft = true;
- }
-
- args.TPlayer.Update(args.TPlayer.whoAmI);
- NetMessage.SendData((int)PacketTypes.PlayerUpdate, -1, -1, NetworkText.Empty, args.Player.Index);
- return true;
- }
-
- NetMessage.SendData((int)PacketTypes.PlayerUpdate, -1, args.Player.Index, NetworkText.Empty, args.Player.Index);
- return true;
+ return false;
}
private static bool HandlePlayerHp(GetDataHandlerArgs args)