From 63bf256abf1fa68e4e4e54ef65f13a8addca024b Mon Sep 17 00:00:00 2001 From: Enerdy Date: Wed, 15 Jul 2015 03:12:56 +0100 Subject: [PATCH] Fix bubble tile triggering noclip checks. --- TShockAPI/Utils.cs | 4 +++- TerrariaServerAPI | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index 35f36a9d..300db4ce 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -26,6 +26,7 @@ using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; using Terraria; +using Terraria.ID; using TShockAPI.DB; using BCrypt.Net; @@ -291,7 +292,8 @@ namespace TShockAPI { 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].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; } /// diff --git a/TerrariaServerAPI b/TerrariaServerAPI index bade4cb2..e124c5a5 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit bade4cb223a3a920f9366957efd5d864f5f3bc4c +Subproject commit e124c5a51cf4a418de47b7767b13669a379d1935