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

more compile fixes

Browse Source
This commit is contained in:
Jake Potrebic
2024-12-15 14:12:31 -08:00
parent ec57b99bf5
commit cb51a4fbcd
10 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View File

@@ -834,7 +834,7 @@
+ protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {} // Paper - method for post death logic that cannot be ran before the event is potentially cancelled
- protected void dropExperience(ServerLevel level, @Nullable Entity entity) {
+ protected int getExpReward(ServerLevel level, @Nullable Entity entity) { // CraftBukkit
+ public int getExpReward(ServerLevel level, @Nullable Entity entity) { // CraftBukkit
if (!this.wasExperienceConsumed()
&& (
this.isAlwaysExperienceDropper()

2
paper-server/patches/sources/net/minecraft/world/entity/animal/Wolf.java.patch
View File

@@ -75,7 +75,7 @@
DyeColor dyeColor = dyeItem.getDyeColor();
if (dyeColor != this.getCollarColor()) {
+ // Paper start - Add EntityDyeEvent and CollarColorable interface
+ final io.papermc.paper.event.entity.EntityDyeEvent event = new io.papermc.paper.event.entity.EntityDyeEvent(this.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData((byte) dyeColor.getId()), player.getBukkitEntity());
+ final io.papermc.paper.event.entity.EntityDyeEvent event = new io.papermc.paper.event.entity.EntityDyeEvent(this.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData((byte) dyeColor.getId()), (org.bukkit.entity.Player) player.getBukkitEntity());
+ if (!event.callEvent()) {
+ return InteractionResult.FAIL;
+ }

9
paper-server/patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
View File

@@ -93,6 +93,15 @@
@Override
protected double getDefaultGravity() {
return 0.05;
@@ -329,7 +_,7 @@
this.life = 0;
}
- protected boolean isInGround() {
+ public boolean isInGround() { // Paper - protected -> public
return this.entityData.get(IN_GROUND);
}
@@ -347,8 +_,8 @@
protected void tickDespawn() {

12
paper-server/patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch
View File

@@ -175,7 +175,7 @@
this.onDeflection(entity, deflectedByPlayer);
}
@@ -297,6 +_,11 @@
@@ -297,15 +_,35 @@
}
protected void onHitBlock(BlockHitResult result) {
@@ -187,7 +187,15 @@
BlockState blockState = this.level().getBlockState(result.getBlockPos());
blockState.onProjectileHit(this.level(), blockState, result, this);
}
@@ -306,6 +_,15 @@
+ // Paper start
+ public boolean canHitEntityPublic(final Entity target) {
+ return this.canHitEntity(target);
+ }
+ // Paper end
+
protected boolean canHitEntity(Entity target) {
if (!target.canBeHitByProjectile()) {
return false;
} else {
Entity owner = this.getOwner();