3 files changed, 48 insertions, 60 deletions

diff --git a/Plugins/Core/onblockplace.lua b/Plugins/Core/onblockplace.lua
index 45d9a082e..64ab54920 100644
--- a/Plugins/Core/onblockplace.lua
+++ b/Plugins/Core/onblockplace.lua
@@ -1,5 +1,3 @@
-local BlockData = {}

-

 function OnBlockPlace( Block, Player )

 

 	-- dont check if the direction is in the air

@@ -12,8 +10,39 @@ function OnBlockPlace( Block, Player )
 		if( Y >= 128 or Y < 0 ) then

 			return true

 		end

+		

+		local CheckCollision = function( Player )

+			-- drop the decimals, we only care about the full block X,Y,Z

+			local PlayerX = math.floor(Player:GetPosX(), 0)

+			local PlayerY = math.floor(Player:GetPosY(), 0)

+			local PlayerZ = math.floor(Player:GetPosZ(), 0)

+

+			local BlockX = Block.m_PosX

+			local BlockY = Block.m_PosY

+			local BlockZ = Block.m_PosZ

+

+			-- player height is 2 blocks, so we check the position and then offset it up one

+			-- so they can't place a block on there face

+

+			local collision = false

+			if Block.m_Direction == 0 then if PlayerY == BlockY-2 and PlayerX == BlockX and PlayerZ == BlockZ then collision = true end end

+			if Block.m_Direction == 1 then if PlayerY == BlockY+1 and PlayerX == BlockX and PlayerZ == BlockZ then collision = true end end

 

-		BlockData = Block

+			if Block.m_Direction == 2 then if PlayerY == BlockY and PlayerX == BlockX and PlayerZ == BlockZ-1 then collision = true end end

+			if Block.m_Direction == 2 then if PlayerY+1 == BlockY and PlayerX == BlockX and PlayerZ == BlockZ-1 then collision = true end end

+

+			if Block.m_Direction == 3 then if PlayerY == BlockY and PlayerX == BlockX and PlayerZ == BlockZ+1 then collision = true end end

+			if Block.m_Direction == 3 then if PlayerY+1 == BlockY and PlayerX == BlockX and PlayerZ == BlockZ+1 then collision = true end end

+

+			if Block.m_Direction == 4 then if PlayerY == BlockY and PlayerX == BlockX-1 and PlayerZ == BlockZ then collision = true end end

+			if Block.m_Direction == 4 then if PlayerY+1 == BlockY and PlayerX == BlockX-1 and PlayerZ == BlockZ then collision = true end end

+

+			if Block.m_Direction == 5 then if PlayerY == BlockY and PlayerX == BlockX+1 and PlayerZ == BlockZ then collision = true end end

+			if Block.m_Direction == 5 then if PlayerY+1 == BlockY and PlayerX == BlockX+1 and PlayerZ == BlockZ then collision = true end end

+			

+			return collision

+		end

+		

 		if( Player:GetWorld():ForEachPlayer( CheckCollision ) == false ) then

 			return true

 		else

@@ -24,36 +53,4 @@ function OnBlockPlace( Block, Player )
 

 	return false

 

-end

-

-function CheckCollision( Player )	

-	-- drop the decimals, we only care about the full block X,Y,Z

-	local PlayerX = math.floor(Player:GetPosX(), 0)

-	local PlayerY = math.floor(Player:GetPosY(), 0)

-	local PlayerZ = math.floor(Player:GetPosZ(), 0)

-

-	local BlockX = BlockData.m_PosX

-	local BlockY = BlockData.m_PosY

-	local BlockZ = BlockData.m_PosZ

-

-	-- player height is 2 blocks, so we check the position and then offset it up one

-	-- so they can't place a block on there face

-

-	local collision = false

-	if BlockData.m_Direction == 0 then if PlayerY == BlockY-2 and PlayerX == BlockX and PlayerZ == BlockZ then collision = true end end

-	if BlockData.m_Direction == 1 then if PlayerY == BlockY+1 and PlayerX == BlockX and PlayerZ == BlockZ then collision = true end end

-

-	if BlockData.m_Direction == 2 then if PlayerY == BlockY and PlayerX == BlockX and PlayerZ == BlockZ-1 then collision = true end end

-	if BlockData.m_Direction == 2 then if PlayerY+1 == BlockY and PlayerX == BlockX and PlayerZ == BlockZ-1 then collision = true end end

-

-	if BlockData.m_Direction == 3 then if PlayerY == BlockY and PlayerX == BlockX and PlayerZ == BlockZ+1 then collision = true end end

-	if BlockData.m_Direction == 3 then if PlayerY+1 == BlockY and PlayerX == BlockX and PlayerZ == BlockZ+1 then collision = true end end

-

-	if BlockData.m_Direction == 4 then if PlayerY == BlockY and PlayerX == BlockX-1 and PlayerZ == BlockZ then collision = true end end

-	if BlockData.m_Direction == 4 then if PlayerY+1 == BlockY and PlayerX == BlockX-1 and PlayerZ == BlockZ then collision = true end end

-

-	if BlockData.m_Direction == 5 then if PlayerY == BlockY and PlayerX == BlockX+1 and PlayerZ == BlockZ then collision = true end end

-	if BlockData.m_Direction == 5 then if PlayerY+1 == BlockY and PlayerX == BlockX+1 and PlayerZ == BlockZ then collision = true end end

-	

-	return collision

 end
\ No newline at end of file
diff --git a/Plugins/Core/playerlist.lua b/Plugins/Core/playerlist.lua
index 63990e825..f06dfed85 100644
--- a/Plugins/Core/playerlist.lua
+++ b/Plugins/Core/playerlist.lua
@@ -1,7 +1,9 @@
-local PlayerTable = {}

-

 function HandlePlayerListCommand( Split, Player )

-	PlayerTable = {}

+

+	local PlayerTable = {}

+	local AppendToTable = function( Player )

+		table.insert(PlayerTable, Player:GetName() )

+	end

 	Player:GetWorld():ForEachPlayer( AppendToTable )

 

 	local Message = cChatColor.Green .. "Connected players: (".. cChatColor.White.. #PlayerTable .. cChatColor.Green .. ")"

@@ -9,8 +11,4 @@ function HandlePlayerListCommand( Split, Player )
 	

 	Player:SendMessage( table.concat(PlayerTable, " ") )

 	return true

-end

-

-function AppendToTable( Player )

-	table.insert(PlayerTable, Player:GetName() )

 end
\ No newline at end of file
diff --git a/Plugins/Core/web_playerlist.lua b/Plugins/Core/web_playerlist.lua
index 62ccb1d44..ed6b7667c 100644
--- a/Plugins/Core/web_playerlist.lua
+++ b/Plugins/Core/web_playerlist.lua
@@ -1,6 +1,3 @@
-local PlayerHTML = ""

-local PlayerNum = 0

-

 function HandleRequest_PlayerList( Request )

 	local World = cRoot:Get():GetWorld()

 	local Content = ""

@@ -19,25 +16,21 @@ function HandleRequest_PlayerList( Request )
 	Content = Content .. "<p>Connected Players: <b>" .. World:GetNumPlayers() .. "</b></p>"

 	Content = Content .. "<table>"

 	

-	PlayerNum = 0

-	PlayerHTML = ""

-	World:ForEachPlayer( CreatePlayerList )

+	local PlayerNum = 0

+	local AddPlayerToTable = function( Player )

+		PlayerNum = PlayerNum + 1

+		Content = Content .. "<tr>"

+		Content = Content .. "<td style='width: 10px;'>" .. PlayerNum .. ".</td>"

+		Content = Content .. "<td>" .. Player:GetName() .. "</td>"

+		Content = Content .. "<td><a href='?playerlist-kick=" .. Player:GetName() .. "'>Kick</a></td>"

+		Content = Content .. "</tr>"

+	end

+	World:ForEachPlayer( AddPlayerToTable )

 

-	if( PlayerHTML ~= "" ) then

-		Content = Content .. PlayerHTML

-	else

+	if( PlayerNum == 0 ) then

 		Content = Content .. "<tr><td>None</td></tr>"

 	end

 	Content = Content .. "</table>"

 	Content = Content .. "<br>"

 	return Content

-end

-

-function CreatePlayerList( Player, Data )

-	PlayerNum = PlayerNum + 1

-	PlayerHTML = PlayerHTML .. "<tr>"

-	PlayerHTML = PlayerHTML .. "<td style='width: 10px;'>" .. PlayerNum .. ".</td>"

-	PlayerHTML = PlayerHTML .. "<td>" .. Player:GetName() .. "</td>"

-	PlayerHTML = PlayerHTML .. "<td><a href='?playerlist-kick=" .. Player:GetName() .. "'>Kick</a></td>"

-	PlayerHTML = PlayerHTML .. "</tr>"

 end
\ No newline at end of file