themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix bubble tile triggering noclip checks.

Browse source
This commit is contained in:
Enerdy 2015-07-15 03:12:56 +01:00
parent f6e819feb6
commit 63bf256abf
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Utils.cs
View file

@ -26,6 +26,7 @@ using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Terraria; using Terraria;
using Terraria.ID;
using TShockAPI.DB; using TShockAPI.DB;
using BCrypt.Net; using BCrypt.Net;
@ -291,7 +292,8 @@ namespace TShockAPI
{ {
return TilePlacementValid(tileX, tileY) && Main.tile[tileX, tileY] != null && return TilePlacementValid(tileX, tileY) && Main.tile[tileX, tileY] != null &&
Main.tile[tileX, tileY].active() && Main.tileSolid[Main.tile[tileX, tileY].type] && Main.tile[tileX, tileY].active() && Main.tileSolid[Main.tile[tileX, tileY].type] &&
!Main.tile[tileX, tileY].inActive() && !Main.tile[tileX, tileY].halfBrick() && Main.tile[tileX, tileY].slope() == 0; !Main.tile[tileX, tileY].inActive() && !Main.tile[tileX, tileY].halfBrick() &&
Main.tile[tileX, tileY].slope() == 0 && Main.tile[tileX, tileY].type != TileID.Bubble;
} }
/// <summary> /// <summary>

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit bade4cb223a3a920f9366957efd5d864f5f3bc4c Subproject commit e124c5a51cf4a418de47b7767b13669a379d1935