Merge remote branch 'origin/general-devel' into general-devel
This commit is contained in:
commit
04e8f0b8ce
2 changed files with 0 additions and 5 deletions
|
|
@ -2163,11 +2163,6 @@ namespace TShockAPI
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pulley > 2)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args.Player.LastNetPosition == Vector2.Zero)
|
if (args.Player.LastNetPosition == Vector2.Zero)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue