diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index 28ff082b1..01f5387fc 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -832,7 +832,7 @@ void CCharacter::Tick()
 		if((int)GameServer()->Collision()->GetPos(MapIndex).x)
 			if((int)GameServer()->Collision()->GetPos(MapIndex).x < (int)m_Core.m_Pos.x)
 			{
-				m_Core.m_Pos.x = m_PrevPos.x;
+				m_Core.m_Pos = m_PrevPos;
 				//dbg_msg("Resetting","%d",Server()->Tick());
 			}
 		m_Core.m_Vel.x = 0;
@@ -842,7 +842,7 @@ void CCharacter::Tick()
 		if((int)GameServer()->Collision()->GetPos(MapIndex).x)
 			if((int)GameServer()->Collision()->GetPos(MapIndex).x > (int)m_Core.m_Pos.x)
 			{
-				m_Core.m_Pos.x = m_PrevPos.x;
+				m_Core.m_Pos = m_PrevPos;
 				//dbg_msg("Resetting","%d",Server()->Tick());
 			}
 		m_Core.m_Vel.x = 0;
@@ -852,7 +852,7 @@ void CCharacter::Tick()
 		if((int)GameServer()->Collision()->GetPos(MapIndex).y)
 			if((int)GameServer()->Collision()->GetPos(MapIndex).y > (int)m_Core.m_Pos.y)
 			{
-				m_Core.m_Pos.y = m_PrevPos.y;
+				m_Core.m_Pos = m_PrevPos;
 				//dbg_msg("Resetting","%d",Server()->Tick());
 			}
 		m_Core.m_Vel.y = 0;
@@ -864,7 +864,7 @@ void CCharacter::Tick()
 			if((int)GameServer()->Collision()->GetPos(MapIndex).y < (int)m_Core.m_Pos.y)
 			{
 				//dbg_msg("Resetting","%d",Server()->Tick());
-				m_Core.m_Pos.y = m_PrevPos.y;
+				m_Core.m_Pos = m_PrevPos;
 			}
 		m_Core.m_Vel.y = 0;
 		m_Core.m_Jumped = 0;
diff --git a/src/game/server/entities/dragger.cpp b/src/game/server/entities/dragger.cpp
index 909c8b8c9..740161736 100644
--- a/src/game/server/entities/dragger.cpp
+++ b/src/game/server/entities/dragger.cpp
@@ -77,21 +77,16 @@ void CDragger::Drag()
 		else
 			if (length(m_Pos-m_Target->m_Pos)>28)
 			{
-				//vec2 Temp = m_Target->m_Core.m_Vel +(normalize(m_Pos-m_Target->m_Pos)*m_Strength);
-				if(((m_Target->m_TileIndexL == TILE_STOPA || m_Target->m_TileFIndexL == TILE_STOPA || m_Target->m_TileIndex == TILE_STOPL || m_Target->m_TileIndexL == TILE_STOPL || m_Target->m_TileFIndex == TILE_STOPL || m_Target->m_TileFIndexL == TILE_STOPL || m_Target->m_TileIndexL == TILE_STOPH || m_Target->m_TileFIndexL == TILE_STOPH)) || ((m_Target->m_TileIndexR == TILE_STOPA || m_Target->m_TileFIndexR == TILE_STOPA || m_Target->m_TileIndex == TILE_STOPR || m_Target->m_TileIndexR == TILE_STOPR || m_Target->m_TileFIndex == TILE_STOPR || m_Target->m_TileFIndexR == TILE_STOPR || m_Target->m_TileIndexR == TILE_STOPH || m_Target->m_TileFIndexR == TILE_STOPH)))
-					{
-						m_Target->m_Core.m_Vel.y +=(normalize(m_Pos-m_Target->m_Pos)*m_Strength).y;
-						//dbg_msg("","x");
-						return;
-					}
-				if(((m_Target->m_TileIndexB == TILE_STOPA || m_Target->m_TileFIndexB == TILE_STOPA || m_Target->m_TileIndex == TILE_STOPB || m_Target->m_TileIndexB == TILE_STOPB || m_Target->m_TileFIndex == TILE_STOPB || m_Target->m_TileFIndexB == TILE_STOPB|| m_Target->m_TileIndexB == TILE_STOPV || m_Target->m_TileFIndexB == TILE_STOPV)) || ((m_Target->m_TileIndexT == TILE_STOPA || m_Target->m_TileFIndexT == TILE_STOPA || m_Target->m_TileIndex == TILE_STOPT || m_Target->m_TileIndexT == TILE_STOPT || m_Target->m_TileFIndex == TILE_STOPT || m_Target->m_TileFIndexT == TILE_STOPT || m_Target->m_TileIndexT == TILE_STOPV || m_Target->m_TileFIndexT == TILE_STOPV)))
-					{
-						m_Target->m_Core.m_Vel.x +=(normalize(m_Pos-m_Target->m_Pos)*m_Strength).x;
-						//dbg_msg("y","");
-						return;
-					}
-				//m_Target->m_Core.m_Vel = Temp;
-				m_Target->m_Core.m_Vel +=(normalize(m_Pos-m_Target->m_Pos)*m_Strength);
+				vec2 Temp = m_Target->m_Core.m_Vel +(normalize(m_Pos-m_Target->m_Pos)*m_Strength);
+				if(Temp.x > 0 && (m_Target->m_TileIndexL == TILE_STOPA || m_Target->m_TileFIndexL == TILE_STOPA || m_Target->m_TileIndex == TILE_STOPL || m_Target->m_TileIndexL == TILE_STOPL || m_Target->m_TileFIndex == TILE_STOPL || m_Target->m_TileFIndexL == TILE_STOPL || m_Target->m_TileIndexL == TILE_STOPH || m_Target->m_TileFIndexL == TILE_STOPH))
+					Temp.x = 0;
+				if(Temp.x < 0 && (m_Target->m_TileIndexR == TILE_STOPA || m_Target->m_TileFIndexR == TILE_STOPA || m_Target->m_TileIndex == TILE_STOPR || m_Target->m_TileIndexR == TILE_STOPR || m_Target->m_TileFIndex == TILE_STOPR || m_Target->m_TileFIndexR == TILE_STOPR || m_Target->m_TileIndexR == TILE_STOPH || m_Target->m_TileFIndexR == TILE_STOPH))
+					Temp.x = 0;
+				if(Temp.y < 0 && (m_Target->m_TileIndexB == TILE_STOPA || m_Target->m_TileFIndexB == TILE_STOPA || m_Target->m_TileIndex == TILE_STOPB || m_Target->m_TileIndexB == TILE_STOPB || m_Target->m_TileFIndex == TILE_STOPB || m_Target->m_TileFIndexB == TILE_STOPB|| m_Target->m_TileIndexB == TILE_STOPV || m_Target->m_TileFIndexB == TILE_STOPV))
+					Temp.y = 0;
+				if(Temp.y > 0 && (m_Target->m_TileIndexT == TILE_STOPA || m_Target->m_TileFIndexT == TILE_STOPA || m_Target->m_TileIndex == TILE_STOPT || m_Target->m_TileIndexT == TILE_STOPT || m_Target->m_TileFIndex == TILE_STOPT || m_Target->m_TileFIndexT == TILE_STOPT || m_Target->m_TileIndexT == TILE_STOPV || m_Target->m_TileFIndexT == TILE_STOPV))
+					Temp.y = 0;
+				m_Target->m_Core.m_Vel = Temp;
 			}
 	}
 }