tetris/modes/gamemode.lua

@@ -237,7 +237,6 @@ function GameMode:update(inputs, ruleset)
 				self.lock_on_soft_drop
 			then
 				self.piece.locked = true
-				self.piece_soft_locked = true
 			end
 		end
 
@@ -418,10 +417,9 @@ function GameMode:dasCut()
 end
 
 function GameMode:areCancel(inputs, ruleset)
-	if ruleset.are_cancel and strTrueValues(inputs) ~= "" and
+	if ruleset.are_cancel and self.piece_hard_dropped and
 	not self.prev_inputs.up and
-	(self.piece_hard_dropped or
+	strTrueValues(inputs) ~= "" then
-	(self.piece_soft_locked and not self.prev_inputs.down)) then
 		self.lcd = 0
 		self.are = 0
 	end
@@ -524,7 +522,6 @@ end
 
 function GameMode:initializeNextPiece(inputs, ruleset, piece_data, generate_next_piece)
 	self.piece_hard_dropped = false
-	self.piece_soft_locked = false
 	local gravity = self:getGravity()
 	self.piece = ruleset:initializePiece(
 		inputs, piece_data, self.grid, gravity,