Update Upstream

95d784f Return false if Entity#remove is unsupported
This commit is contained in:
NotMyFault 2021-04-22 20:41:49 +02:00
parent 207d029def
commit ceacd7b669
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C

View File

@ -113,7 +113,11 @@ public class BukkitEntity implements Entity {
public boolean remove() { public boolean remove() {
org.bukkit.entity.Entity entity = entityRef.get(); org.bukkit.entity.Entity entity = entityRef.get();
if (entity != null) { if (entity != null) {
entity.remove(); try {
entity.remove();
} catch (UnsupportedOperationException e) {
return false;
}
return entity.isDead(); return entity.isDead();
} else { } else {
return true; return true;