SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ci skip] Fix annotation fields used in NMS getBukkitEntity (#12120)

Browse Source
This commit is contained in:
Pedro
2025-02-16 15:17:26 -03:00
committed by GitHub
parent a6e82d90ce
commit cb25c0cf31
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/patches/sources/net/minecraft/server/bossevents/CustomBossEvent.java.patch
View File

@@ -5,7 +5,7 @@
private int value;
private int max = 100;
+ // CraftBukkit start
+ private org.bukkit.boss.KeyedBossBar bossBar;
+ private @javax.annotation.Nullable org.bukkit.boss.KeyedBossBar bossBar;
+
+ public org.bukkit.boss.KeyedBossBar getBukkitEntity() {
+ if (this.bossBar == null) {

4
paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
View File

@@ -86,7 +86,7 @@
+ // Paper end - Share random for entities to make them more random
+ public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason; // Paper - Entity#getEntitySpawnReason
+
+ private org.bukkit.craftbukkit.entity.CraftEntity bukkitEntity;
+ private @Nullable org.bukkit.craftbukkit.entity.CraftEntity bukkitEntity;
+
+ public org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntity() {
+ if (this.bukkitEntity == null) {
@@ -101,7 +101,7 @@
+ return this.bukkitEntity;
+ }
+ // Paper start
+ public org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntityRaw() {
+ public @Nullable org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntityRaw() {
+ return this.bukkitEntity;
+ }
+ // Paper end