Update to OTAPI 2.0.0.12

Pryaxis · Dec 10, 2016 · 5144bad · 5144bad
1 parent 8ebaeee
commit 5144bad
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/TShock.Modifications.Bootstrapper/TShock.Modifications.Bootstrapper.csproj b/TShock.Modifications.Bootstrapper/TShock.Modifications.Bootstrapper.csproj
@@ -70,7 +70,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="OTAPI, Version=1.3.4.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OTAPI.2.0.0.10\lib\net451\OTAPI.dll</HintPath>
+      <HintPath>..\packages\OTAPI.2.0.0.12\lib\net451\OTAPI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OTAPI.Patcher.Engine">

diff --git a/TShock.Modifications.Bootstrapper/packages.config b/TShock.Modifications.Bootstrapper/packages.config
@@ -6,5 +6,5 @@
   <package id="NDesk.Options" version="0.2.1" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
   <package id="NuGet.Core" version="2.12.0" targetFramework="net452" />
-  <package id="OTAPI" version="2.0.0.10" targetFramework="net452" />
+  <package id="OTAPI" version="2.0.0.12" targetFramework="net452" />
 </packages>
diff --git a/TShock.Modifications.SSC/TShock.Modifications.SSC.csproj b/TShock.Modifications.SSC/TShock.Modifications.SSC.csproj
@@ -52,7 +52,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="OTAPI, Version=1.3.4.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OTAPI.2.0.0.10\lib\net451\OTAPI.dll</HintPath>
+      <HintPath>..\packages\OTAPI.2.0.0.12\lib\net451\OTAPI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OTAPI.Patcher.Engine">

diff --git a/TShock.Modifications.SSC/packages.config b/TShock.Modifications.SSC/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
-  <package id="OTAPI" version="2.0.0.10" targetFramework="net452" />
+  <package id="OTAPI" version="2.0.0.12" targetFramework="net452" />
 </packages>
diff --git a/TerrariaServerAPI/TerrariaApi.Server/HookManager.cs b/TerrariaServerAPI/TerrariaApi.Server/HookManager.cs
@@ -154,8 +154,7 @@ public void AttachHooks(string[] args)
 
                 return HookResult.Continue;
             };
-            Hooks.Net.ReceiveData = (MessageBuffer buffer, ref byte packetId, ref int readOffset, ref int start, ref int length,
-                  ref int messageType) =>
+            Hooks.Net.ReceiveData = (MessageBuffer buffer, ref byte packetId, ref int readOffset, ref int start, ref int length) =>
             {
                 try
                 {
@@ -225,7 +224,7 @@ public void AttachHooks(string[] args)
                 }
                 return HookResult.Continue;
             };
-            Hooks.Npc.Strike = (NPC npc, ref int cancelResult, ref int damage, ref float knockBack,
+            Hooks.Npc.Strike = (NPC npc, ref double cancelResult, ref int damage, ref float knockBack,
                ref int hitDirection, ref bool critical, ref bool noEffect, ref bool fromNet, Entity entity) =>
             {
                 var player = entity as Player;
@@ -312,7 +311,7 @@ public void AttachHooks(string[] args)
                 return HookResult.Continue;
             };
             #endregion
-            Hooks.Collision.PressurePlate = (ref int x, ref int y, ref Entity entity) =>
+            Hooks.Collision.PressurePlate = (ref int x, ref int y, ref IEntity entity) =>
             {
                 var npc = entity as NPC;
                 if (npc != null)

diff --git a/prebuilt/OTAPI.Patcher.Engine.XML b/prebuilt/OTAPI.Patcher.Engine.XML
diff --git a/prebuilt/OTAPI.Patcher.Engine.dll b/prebuilt/OTAPI.Patcher.Engine.dll
diff --git a/prebuilt/OTAPI.Patcher.Engine.pdb b/prebuilt/OTAPI.Patcher.Engine.pdb