From 323135635a4fda28d9be530aea9e43e3009b0d57 Mon Sep 17 00:00:00 2001 From: high Date: Tue, 9 Aug 2011 19:18:59 -0400 Subject: [PATCH] Updated api dll again buffering is on by default now --- TShockAPI/ConfigFile.cs | 2 +- TShockAPI/GetDataHandlers.cs | 4 ++-- TShockAPI/TSPlayer.cs | 4 ++-- TerrariaServerBins/TerrariaServerAPI.dll | Bin 35840 -> 35840 bytes 4 files changed, 5 insertions(+), 5 deletions(-) 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 /// /// Buffers up the packets and sends them out at the end of each frame /// - public bool BufferPackets = false; + public bool BufferPackets = true; /// /// 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 destroyedTiles) diff --git a/TerrariaServerBins/TerrariaServerAPI.dll b/TerrariaServerBins/TerrariaServerAPI.dll index 0f3c4d353e176d199b786fbd0ce09862939ccf52..695d04acd90d9e9ac66dd0d8b760f9cc2b56ddb8 100644 GIT binary patch delta 6123 zcma)A3wRXO6+ZXQ?(EELNV3ml-@7D)S9oZ!Mg;+b%0mK*z$YjYk_bqYgoF|ZW)ck1 z#9B=U6@+Rmp&IljRBA;iQl#hJnIy9W{M_%m|D6B4?m6eq z?5k!atyxJQzMraFn;OI9yQbEu$<1p4#sR*z0aOZ2F;~(7fF$G+8iHDkW^1>Q-sFT< zOH{I3Bh+Qho&i9#rsbE%C(?y3(h%S2$+wVD+~c2V@m2y@6wz*@ebNDx3K<}fq*iKM z!@fW!fTOz0?oYIb$1Y9`Rd^^2k(sjk~bViKUI}#?9 z+I1X@BT=$gt4DdUwk{IY+GC3XJy>j2;(h|(uSy#vg-3Oncv{1xmm+qSlFw6Q+xdmg zABYWgm6xI&?CG+l;;53;rCN#-9=x=3Kc3Vu=}D!|q+_d@U$#=cREx#Zz4vqm@p_I8>079FNR8DY)SD@`lP@M+ifO0nts8Xi*9 znavbZqhUxYGYz2Le&tzMgi>9j-Ifvc)^_@vcCY2Bx=f~2wLBFwnNrnas(_Z7Y4t8k zOsCIr86R<%iKpu@;fPb2$&_xHwlNl%(w`0I-o$*#d^k*r_i>~ zo@wbUfoVTRsUXh(qjokU-CLKqrCw(pZ=uU%YN1YJEijWQWgTl_ZZ>OSd1Ag4-U3r% z3&HL!oEO74x=2hu&yDxia&2T*|Ll6q*{>%R?%_h1R^8X3-~uY{?@-*Yt<1_I4cgYM zk;7KvU6{e{P8{BxD9V#67R1NTTnN75|mB=z~>AyuAe++6kcnPKc@}r zJ;>95>?E!z0ibyO6RzP}ZSUi1vtus}!%oLKhXQG?81=$8uDw)&+r2Twl(afUfh>-B z9A|N?;<$q2^BmvgNYf9cDd6Rpna*N|ajZz6maaf+`h$pXa6FQ}C;jhmMrHRj^z$h` z1;%o$M|8qdz82j6T^}prd*1=H4)^Eyy-?z3#XaVa(VpN8ob@YkRp63<0yl8HGr;`o zIks`l`y4;#7z{Gc(Lv@@$+0P@vKsdx$pRWW8O(wnhzj%!4M+WOj!QzbLkg@4v9Jvs zk8}JfRHsab0bzh-7!%G7D{yOgxRMOZ!gq#~;Y9cY#32zTkK%YYq5@5k*`Z`;=JK{k z%!x@oQI>iD$NcEk@pF9_k;w~S3)GTSXd>5w43!33&Dj!oo!i!Nwj2&YEuQ;EG8jGU z;V=+n+mMBz0Z!mar@|ic6$wG3_E!Hx@)Q2|B?s*FABw+{y^g3;YH}Sjg()?oI8NYr z8=@%gN!|`qYUVjAty5|$I97AKk7E;}0}jzz#DMS!;(Lx=i02&T!~xmP7Q|NPLDYQc zWcsMe`H{|yVk=Oe z-bP)hpU7D)Eb(oNTL(QTI_muINRPlw{8$2Lf;ar1#MfT-prAHdkHMOuO!=r}6&kJI zz;1&L5T3Ap3zlKJEf3jukgGGeRcN&yhf0IpC2X{Q53d@YA3EBtKfpHzJB;iEM6Tvp z;77+t)*oSr&Lo?&N+l;@jzL|{Dsl=|8?HT_8_0j*1;aMl`3yM?Ul?o-vY#MrxSsR@ z=O=ImvUMiC=sadU12YY_71{q_h2i@aMHo$XfjXZWu{Pa-`B{YU6YW!Fbm zAR}}p^>axgAr%J8MMlXphUXZUM-<3D!*)B`tR!h9;OkN8E@UDZp);sPPa7#UY#Q2R zm9!YN8L2|{8Lls&tDQ*K=xKJij#+zI`nE2fe?2J7MO zD>{gj$Fo4hohv#?uFj+@-N&qMqLvu+2BaR+Y`7My+ zxm;)PXLpt8BjY&RDZlKVD)`Aw2HWax6#Znn!QSGwSq9t7+1weN)=P)oV~L-X8SFpq zd}K=u_OrVg0%V!NBu@*n2RN&foSuioAkjFhl>(j>$kymKd=OS>^3cmuTEsBfu1BM8 zy*6Q}M}63XU&UaWm*FE^?vATbPhl;$K5dfCp3F+&c|-wTMzp{-L@T_5NZ?AquW&;1_26NKxvL0;KpTZ~#fDH&B@;18rBy+vFh>j?=E38A+p|QXbOl?gl z&YXfJrJ!%tB?~;tVnpfsi#6u-f{Mez3nudM8qJ+`mqXk$*3C1ko5mc=q6iGUppSa- zQ`b{m%EQckGfhX|U2b@FNN5R zj=$pmH=paTk(;z(BL=Bv&sDroR)hdgB3fWAFU#z+zMDoL$_5_w5|7%#eaz$2TVi8ba1vyQN=FQA|QEVV>bd$IWu?3z&+zhQ8HZ!~d?fJ#Tn#x1ag4=v@%?Z--UT$6szMK+PiCE;8C* zjd+v4PU|}=rrzqGL9*dxAI5z4ALO&$;YB(=eY0Fh6Vc)%uqkJV2Xz9(-6ddLpSzAO0Xk$^{D z0Yb1RYEsnTR3S!V!TvG}y95mbgN2yl(qOK95UvVdjW{ishgcFECtpIB1t-aC&?n2% z4$lT>$t_%t(Z2;fnBmRfUGhkJAh?iYmHZqZ(il28)FA)GkaI(Ec?*mWeJt;Q=^-^{ zVFBOCb7_5OEa?kr;$~=pheFLzM(4;UBbUnwm@N}V-S|hJ1Z4i!36*kiTk?qPxIxzSTWfQ$Q z@{ZC*>m&P=cFG#qMK?q~Rrb?YBF(U$?nM9nbT48X{UY+EQbtc>Y-kr)qBi>)-tijP z5J^EfDcXXSw$V$q!t077g;EKg{ar~F9GCLDfmzp!N3q1W;zzC=1 zayQ}*QjYjGS&F!u6k84o!#|+}a=dp_~IQL>I?AH#bb;I31>;VII_J&yT*x_FhtkMX;XMa>le> zGBb5G6kBRIHgnv@v5n&ajt4n{gLx9I*I4ZqC3&a#AJJ_aVjFKOw3XO?XIp7|%C_DX zx3$?mvz@ltrCw65G)^j){vhp;Y|1T4v9d&YRQX!**oWIk+i$ktW}jAG#qV4BKRFvyK!; zi#LkX#bsi)?OK~(o-WUpYvlFv9{I5Rd*xZB#{Q1|u-#I_KGDptIohy^4Sm-+n9gD{ z5IBn;?&s^i){ak{pnfIhfMUym8MriD>u|k_YcH-7xTur^QCvB=M&g=>YdNm1((}+F z$KjuH4qR!^feE;Za4o>qfa_UY=WvCRav%@aB3!NbwFzHC$ImZXSWUpSA2j4Ud;X5k%oFj3FL*~F59#l;H@Tm0y(bII|eWr8L3>Bow`c>3=d zV>kC`N*~Z?9*zHRVUg8g8N$YN83T5@mdoR}Rb3@})vY7*k>bYz0RI0BnQL(^*EZC7 tiCuf6ZnpCusOWfo%H(KM%u9E#)ut^U6;H1JNudAEi8~sPlcvG8{{y$*i|+sc delta 5986 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