fix some Thief bugs

paulwedeck · Aug 19, 2023 · ad14987 · ad14987
1 parent 89a41fc
commit ad14987
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/jsettlers.logic/src/main/java/jsettlers/logic/movable/civilian/BearerMovable.java b/jsettlers.logic/src/main/java/jsettlers/logic/movable/civilian/BearerMovable.java
@@ -204,7 +204,17 @@ private static Node<BearerMovable> handleOffer() {
 					EOfferPriority minimumAcceptedPriority = mov.request != null ? mov.request.getMinimumAcceptedOfferPriority() : EOfferPriority.LOWEST;
 					return mov.offer.isStillValid(minimumAcceptedPriority);
 				}),
-				take(mov -> mov.materialType, true),
+				selector(
+					take(mov -> mov.materialType, true),
+					sequence(
+						action(mov -> {
+							// material might have been stolen
+							mov.offer.offerTaken();
+							mov.offer = null;
+						}),
+						alwaysFail()
+					)
+				),
 				action(mov -> {
 					mov.offer.offerTaken();
 					mov.offer = null;

diff --git a/jsettlers.logic/src/main/java/jsettlers/logic/movable/specialist/ThiefMovable.java b/jsettlers.logic/src/main/java/jsettlers/logic/movable/specialist/ThiefMovable.java
@@ -86,10 +86,11 @@ public static Node<ThiefMovable> createThiefBehaviour() {
 						selector(
 							condition(mov -> mov.getMaterial() != EMaterialType.NO_MATERIAL),
 							sequence(
-								stealMaterial(),
 								action(mov -> {
+									// 
 									mov.goToTarget = mov.returnPos;
-								})
+								}),
+								stealMaterial()
 							)
 						)
 					)