Avoid NPE in PathfinderGoalTempt
This commit is contained in:
		
					parent
					
						
							
								f0e225b526
							
						
					
				
			
			
				commit
				
					
						b02a8b65df
					
				
			
		
					 1 changed files with 22 additions and 0 deletions
				
			
		|  | @ -0,0 +1,22 @@ | ||||||
|  | From ce308088af5d39170b19f7781e3b4c952e015b4b Mon Sep 17 00:00:00 2001 | ||||||
|  | From: Aikar <aikar@aikar.co> | ||||||
|  | Date: Wed, 29 Nov 2017 22:18:54 -0500 | ||||||
|  | Subject: [PATCH] Avoid NPE in PathfinderGoalTempt | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 | ||||||
|  | index 188825d19..8004f3a3f 100644
 | ||||||
|  | --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 | ||||||
|  | +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 | ||||||
|  | @@ -54,7 +54,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
 | ||||||
|  |                  } | ||||||
|  |                  this.target = (event.getTarget() == null) ? null : ((CraftLivingEntity) event.getTarget()).getHandle(); | ||||||
|  |              } | ||||||
|  | -            return tempt;
 | ||||||
|  | +            return tempt && this.target != null; // Paper - must have target - plugin might of cancelled
 | ||||||
|  |              // CraftBukkit end | ||||||
|  |          } | ||||||
|  |      } | ||||||
|  | -- 
 | ||||||
|  | 2.15.0 | ||||||
|  | 
 | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Aikar
				Aikar