* Changed behavior of some guild-related code (according to X.4 tests):

- removed code that prevented Homunculus Resurrection during WoE
- logging in doesn't activate the 5 minute guild skill block anymore
- non-Urgent guild skills can now only be cast on WoE grounds during WoE
- all guild skills now have no cast delay (previously was 1 second)
- casting guild skills will now block FreeCast sages from walking
- Battle Orders and Regeneration are now instacast
- Restoration now has a 10 second cast time, reducible only by dex
- Urgent Call's cast cannot be reduced anymore (not even by items)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10807 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 3 deletions

diff --git a/src/map/unit.c b/src/map/unit.c
index 7563584fa..c05b8e25a 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -698,9 +698,9 @@ int unit_can_move(struct block_list *bl)
 	
 	if (!ud)
 		return 0;
-	
-	if (ud->skilltimer != -1 && (!sd || pc_checkskill(sd, SA_FREECAST) <= 0))
-		return 0;
+
+	if (ud->skilltimer != -1 && (!sd || !pc_checkskill(sd, SA_FREECAST) || skill_get_inf2(ud->skillid)&INF2_GUILD_SKILL))
+		return 0; // prevent moving while casting
 		
 	if (DIFF_TICK(ud->canmove_tick, gettick()) > 0)
 		return 0;