summaryrefslogtreecommitdiff
path: root/localserver/beta.patch2
blob: 23f921a5c1d671075095dce51fa0cbf94b9736dc (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
diff --git a/src/map/clif.c b/src/map/clif.c
index cd3131181..8b21f37c3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11052,7 +11052,7 @@ static void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action
 		return;
 
 	if(action_type != 0x00 && action_type != 0x07)
-		pc_stop_walking(sd, STOPWALKING_FLAG_FIXPOS);
+		pc_stop_walking(sd, STOPWALKING_FLAG_FIXPOS|STOPWALKING_FLAG_NEXTCELL);
 	pc_stop_attack(sd);
 
 	if(target_id<0 && -target_id == sd->bl.id) // for disguises [Valaris]
@@ -22234,7 +22234,7 @@ static int clif_parse(int fd)
 	//TODO apply delays or disconnect based on packet throughput [FlavioJS]
 	// Note: "click masters" can do 80+ clicks in 10 seconds
 
-	for( pnum = 0; pnum < 3; ++pnum ) { // Limit max packets per cycle to 3 (delay packet spammers) [FlavioJS]  -- This actually aids packet spammers, but stuff like /str+ gets slow without it [Ai4rei]
+	for( pnum = 0; pnum < 6; ++pnum ) { // Limit max packets per cycle to 3 (delay packet spammers) [FlavioJS]  -- This actually aids packet spammers, but stuff like /str+ gets slow without it [Ai4rei]
 		unsigned short (*parse_cmd_func)(int fd, struct map_session_data *sd);
 		// begin main client packet processing loop
 
diff --git a/src/map/unit.c b/src/map/unit.c
index 68e6aeec1..518b5a3ea 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2216,7 +2216,7 @@ static int unit_attack_timer_sub(struct block_list *src, int tid, int64 tick)
 			ud->dir = map->calc_dir(src, target->x,target->y );
 		}
 		if(ud->walktimer != INVALID_TIMER)
-			unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);
+			unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS|STOPWALKING_FLAG_NEXTCELL);
 		if(md) {
 			//First attack is always a normal attack
 			if(md->state.skillstate == MSS_ANGRY || md->state.skillstate == MSS_BERSERK) {