diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
index 31f3b031..c43d821b 100644
--- a/TShockAPI/ConfigFile.cs
+++ b/TShockAPI/ConfigFile.cs
@@ -114,7 +114,7 @@ namespace TShockAPI
         /// <summary>
         /// Buffers up the packets and sends them out at the end of each frame
         /// </summary>
-        public bool BufferPackets = false;
+        public bool BufferPackets = true;
 
         /// <summary>
         /// Display the users group when they chat.
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index baa20668..e6fc4612 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -102,10 +102,10 @@ namespace TShockAPI
                 {PacketTypes.PlayerUpdate, HandlePlayerUpdate},
                 {PacketTypes.Tile, HandleTile},
                 {PacketTypes.TileSendSquare, HandleSendTileSquare},
-                {PacketTypes.NPCUpdate, HandleNpcUpdate},
+                {PacketTypes.NpcUpdate, HandleNpcUpdate},
                 {PacketTypes.PlayerDamage, HandlePlayerDamage},
                 {PacketTypes.ProjectileNew, HandleProjectileNew},
-                {PacketTypes.TogglePVP, HandleTogglePvp},
+                {PacketTypes.TogglePvp, HandleTogglePvp},
                 {PacketTypes.TileKill, HandleTileKill},
                 {PacketTypes.PlayerKillMe, HandlePlayerKillMe},
                 {PacketTypes.LiquidSet, HandleLiquidSet},
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 077eff5a..b5784ba3 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -303,7 +303,7 @@ namespace TShockAPI
                 All.SendMessage(string.Format("{0} has {1} PvP!", Name, pvp ? "enabled" : "disabled"), Main.teamColor[Team]);
             }
             //Broadcast anyways to keep players synced
-            NetMessage.SendData((int)PacketTypes.TogglePVP, -1, -1, "", Index);
+            NetMessage.SendData((int)PacketTypes.TogglePvp, -1, -1, "", Index);
         }
 
         public virtual void SetTeam(int team)
@@ -424,7 +424,7 @@ namespace TShockAPI
         public void StrikeNPC(int npcid, int damage, float knockBack, int hitDirection)
         {
             Main.npc[npcid].StrikeNPC(damage, knockBack, hitDirection);
-            NetMessage.SendData((int)PacketTypes.NPCStrike, -1, -1, "", npcid, damage, knockBack, hitDirection);
+            NetMessage.SendData((int)PacketTypes.NpcStrike, -1, -1, "", npcid, damage, knockBack, hitDirection);
         }
 
         public void RevertKillTile(Dictionary<Vector2, Tile> destroyedTiles)
diff --git a/TerrariaServerBins/TerrariaServerAPI.dll b/TerrariaServerBins/TerrariaServerAPI.dll
index 0f3c4d35..695d04ac 100644
Binary files a/TerrariaServerBins/TerrariaServerAPI.dll and b/TerrariaServerBins/TerrariaServerAPI.dll differ