Release for 1.14

Author: Zack Piispanen

PlayerHooks.cs

@@ -30,7 +30,7 @@ public void OnDamage( object sender, TShockAPI.GetDataHandlers.PlayerDamageEvent
                    if( flags.Contains( Flags.HEALONDAMAGE ) )
                    {
                        int heal = 0;
-                       int damage = Math.Max(args.Damage*(args.Critical == 1 ? 2 : 1) -
+                       int damage = Math.Max(args.Damage*(args.Critical ? 2 : 1) -
                                     (int)(Math.Round(Main.player[args.ID].statDefense * .5)), 1);
 
                        var items = TShock.Utils.GetItemByIdOrName("heart");

RegionFlags.cs

@@ -1,20 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.IO;
-using System.Linq;
-using System.Text;
-using Hooks;
 using Mono.Data.Sqlite;
 using MySql.Data.MySqlClient;
+using TerrariaApi.Server;
 using TShockAPI;
 using TShockAPI.DB;
 using Terraria;
 
 namespace RegionFlags
 {
-    [APIVersion(1,12)]
+    [ApiVersion(1,14)]
     public class RegionFlags : TerrariaPlugin
     {
         private FlaggedRegionManager regions;
@@ -57,9 +54,11 @@ protected override void Dispose(bool disposing)
         {
             if( disposing )
             {
-                GameHooks.Update -= OnUpdate;
-                GameHooks.PostInitialize -= Import;
-                NetHooks.GreetPlayer -= OnGreet;
+				ServerApi.Hooks.GameUpdate.Deregister(this, OnUpdate);
+				ServerApi.Hooks.GamePostInitialize.Deregister(this, Import);
+				GetDataHandlers.ItemDrop -= OnItemDrop;
+				ServerApi.Hooks.NetGreetPlayer.Deregister(this, OnGreet);
+				ServerApi.Hooks.ServerLeave.Deregister(this, OnLeave);
                 GetDataHandlers.NPCStrike -= npchooks.OnNPCStrike;
                 GetDataHandlers.PlayerDamage -= playerhooks.OnDamage;
             }
@@ -68,15 +67,15 @@ protected override void Dispose(bool disposing)
 
         public override void Initialize()
         {
-            TShockAPI.Commands.ChatCommands.Add(new Command("setflags", SetFlags, "rflags", "rf"));
-            TShockAPI.Commands.ChatCommands.Add(new Command("defineflag", DefineRegion, "dreg"));
-            TShockAPI.Commands.ChatCommands.Add(new Command("setflags", SetDPS, "regdamage", "rd"));
-            TShockAPI.Commands.ChatCommands.Add(new Command("setflags", SetHPS, "regheal", "rh"));
-            GameHooks.Update += OnUpdate;
-            GameHooks.PostInitialize += Import  ;
-            TShockAPI.GetDataHandlers.ItemDrop += OnItemDrop;
-            NetHooks.GreetPlayer += OnGreet;
-            ServerHooks.Leave += OnLeave;
+            Commands.ChatCommands.Add(new Command("setflags", SetFlags, "rflags", "rf"));
+            Commands.ChatCommands.Add(new Command("defineflag", DefineRegion, "dreg"));
+            Commands.ChatCommands.Add(new Command("setflags", SetDPS, "regdamage", "rd"));
+            Commands.ChatCommands.Add(new Command("setflags", SetHPS, "regheal", "rh"));
+            ServerApi.Hooks.GameUpdate.Register(this, OnUpdate);
+            ServerApi.Hooks.GamePostInitialize.Register(this, Import);
+            GetDataHandlers.ItemDrop += OnItemDrop;
+            ServerApi.Hooks.NetGreetPlayer.Register(this, OnGreet);
+            ServerApi.Hooks.ServerLeave.Register(this, OnLeave);
             GetDataHandlers.NPCStrike += npchooks.OnNPCStrike;
             GetDataHandlers.PlayerDamage += playerhooks.OnDamage;
             Database();
@@ -128,7 +127,7 @@ private void Database()
             creator.EnsureExists(table);
         }
 
-        private void Import()
+        private void Import(EventArgs args)
         {
             String query = "SELECT * FROM Regions";
 
@@ -160,24 +159,24 @@ private void OnItemDrop( object sender, TShockAPI.GetDataHandlers.ItemDropEventA
             }
         }
 
-        private void OnGreet( int id, HandledEventArgs args)
+        private void OnGreet(GreetPlayerEventArgs args)
         {
             lock (players)
             {
-                players[id] = new RegionPlayer(TShock.Players[id], regions);
+				players[args.Who] = new RegionPlayer(TShock.Players[args.Who], regions);
             }
         }
 
-        private void OnLeave(int id)
+        private void OnLeave(LeaveEventArgs args)
         {
             lock (players)
             {
-                players[id] = null;
+                players[args.Who] = null;
             }
         }
 
         private DateTime lastUpdate = DateTime.Now;
-        private void OnUpdate()
+        private void OnUpdate(EventArgs args)
         {
             lock( players )
             {

RegionPlayer.cs

@@ -46,7 +46,7 @@ public void Update()
                     if( flags.Contains(Flags.PRIVATE) && !r.HasPermissionToBuildInRegion(player) )
                     {
                         Vector2 pos = positions.getTP();
-                        player.Teleport((int)pos.X / 16, (int)pos.Y / 16);
+                        player.Teleport((int)pos.X, (int)pos.Y);
                         if( warning )
                         {
                             player.SendMessage("You are barred from entering that region.", Color.Red);