twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-05-19 05:30:23 -07:00
Code Issues 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/patches/features/0006-Optimize-Collision-to-not-load-chunks.patch
View File

@ -22,7 +22,7 @@ index 334859c5ff7023c730513301cc11c9837b2c7823..45f69a914d5a0565196c4105d6154104
public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason; // Paper - Entity#getEntitySpawnReason public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason; // Paper - Entity#getEntitySpawnReason
+ public boolean collisionLoadChunks = false; // Paper + public boolean collisionLoadChunks = false; // Paper
private org.bukkit.craftbukkit.entity.CraftEntity bukkitEntity; private @Nullable org.bukkit.craftbukkit.entity.CraftEntity bukkitEntity;
public org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntity() { public org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntity() {
diff --git a/net/minecraft/world/level/BlockCollisions.java b/net/minecraft/world/level/BlockCollisions.java diff --git a/net/minecraft/world/level/BlockCollisions.java b/net/minecraft/world/level/BlockCollisions.java

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

@ -5,7 +5,7 @@
private int value; private int value;
private int max = 100; private int max = 100;
+ // CraftBukkit start + // CraftBukkit start
+ private org.bukkit.boss.KeyedBossBar bossBar; + private @javax.annotation.Nullable org.bukkit.boss.KeyedBossBar bossBar;
+ +
+ public org.bukkit.boss.KeyedBossBar getBukkitEntity() { + public org.bukkit.boss.KeyedBossBar getBukkitEntity() {
+ if (this.bossBar == null) { + 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 + // Paper end - Share random for entities to make them more random
+ public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason; // Paper - Entity#getEntitySpawnReason + 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() { + public org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntity() {
+ if (this.bukkitEntity == null) { + if (this.bukkitEntity == null) {
@ -101,7 +101,7 @@
+ return this.bukkitEntity; + return this.bukkitEntity;
+ } + }
+ // Paper start + // Paper start
+ public org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntityRaw() { + public @Nullable org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntityRaw() {
+ return this.bukkitEntity; + return this.bukkitEntity;
+ } + }
+ // Paper end + // Paper end