mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 10:35:38 +01:00
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 9 Jul 2023 11:55:02 -0700
|
|
Subject: [PATCH] API for an entity's scoreboard name
|
|
|
|
Was obtainable through different methods, but you had to use different
|
|
methods depending on the implementation of Entity you were working with.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
index bc37a3fc38e1966af3722ed16b3f940c2a8387a9..b5622c5bcc97ff9241d236a35018918db5b2103a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -1261,4 +1261,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
return !this.getHandle().level().noCollision(this.getHandle(), aabb);
|
|
}
|
|
// Paper end - Collision API
|
|
+
|
|
+ // Paper start - entity scoreboard name
|
|
+ @Override
|
|
+ public String getScoreboardEntryName() {
|
|
+ return this.getHandle().getScoreboardName();
|
|
+ }
|
|
+ // Paper end - entity scoreboard name
|
|
}
|