feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Corrected very broken Actor equality check

Browse Source
This commit is contained in:
frymaster
2015-02-17 20:44:56 +00:00
parent a4e4c35371
commit be06056d5f
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/diddiz/LogBlock/Actor.java
View File

@@ -28,10 +28,7 @@ public class Actor {
return false; return false;
} }
final Actor other = (Actor) obj; final Actor other = (Actor) obj;
if ((this.UUID == null) ? (other.UUID != null) : !this.UUID.equals(other.UUID)) { return ((this.UUID == null && other.UUID == null) || this.UUID.equals(other.UUID));
return false;
}
return true;
} }
final String name; final String name;
@@ -71,7 +68,6 @@ public class Actor {
return new Actor(entity.getName()); return new Actor(entity.getName());
} }
public static Actor actorFromProjectileSource(ProjectileSource psource) { public static Actor actorFromProjectileSource(ProjectileSource psource) {
if (psource instanceof Player) { if (psource instanceof Player) {
Player player = ((Player) psource).getPlayer(); Player player = ((Player) psource).getPlayer();