twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add EntityDyeEvent and CollarColorable interface

Browse Source
This commit is contained in:
Jake Potrebic
2022-03-18 21:15:55 -07:00
parent fc19bf4dc5
commit 2e86b22228
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,21 @@
this.setVariant((Holder) BuiltInRegistries.CAT_VARIANT.getOrThrow(CatVariant.ALL_BLACK)); this.setVariant((Holder) BuiltInRegistries.CAT_VARIANT.getOrThrow(CatVariant.ALL_BLACK));
this.setPersistenceRequired(); this.setPersistenceRequired();
} }
@@ -462,7 +462,7 @@ @@ -386,6 +386,13 @@
DyeColor enumcolor = itemdye.getDyeColor();
if (enumcolor != 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) enumcolor.getId()), ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity());
+ if (!event.callEvent()) {
+ return InteractionResult.FAIL;
+ }
+ enumcolor = DyeColor.byId(event.getColor().getWoolData());
+ // Paper end - Add EntityDyeEvent and CollarColorable interface
if (!this.level().isClientSide()) {
this.setCollarColor(enumcolor);
itemstack.consume(1, player);
@@ -462,7 +469,7 @@
} }
private void tryToTame(Player player) { private void tryToTame(Player player) {
@@ -31,7 +45,7 @@
this.tame(player); this.tame(player);
this.setOrderedToSit(true); this.setOrderedToSit(true);
this.level().broadcastEntityEvent(this, (byte) 7); this.level().broadcastEntityEvent(this, (byte) 7);
@@ -480,7 +480,7 @@ @@ -480,7 +487,7 @@
private static class CatTemptGoal extends TemptGoal { private static class CatTemptGoal extends TemptGoal {
@Nullable @Nullable
@@ -40,7 +54,7 @@
private final Cat cat; private final Cat cat;
public CatTemptGoal(Cat cat, double speed, Predicate<ItemStack> foodPredicate, boolean canBeScared) { public CatTemptGoal(Cat cat, double speed, Predicate<ItemStack> foodPredicate, boolean canBeScared) {
@@ -614,7 +614,15 @@ @@ -614,7 +621,15 @@
this.cat.randomTeleport((double) (blockposition_mutableblockposition.getX() + randomsource.nextInt(11) - 5), (double) (blockposition_mutableblockposition.getY() + randomsource.nextInt(5) - 2), (double) (blockposition_mutableblockposition.getZ() + randomsource.nextInt(11) - 5), false); this.cat.randomTeleport((double) (blockposition_mutableblockposition.getX() + randomsource.nextInt(11) - 5), (double) (blockposition_mutableblockposition.getY() + randomsource.nextInt(5) - 2), (double) (blockposition_mutableblockposition.getZ() + randomsource.nextInt(11) - 5), false);
blockposition_mutableblockposition.set(this.cat.blockPosition()); blockposition_mutableblockposition.set(this.cat.blockPosition());
this.cat.dropFromGiftLootTable(getServerLevel((Entity) this.cat), BuiltInLootTables.CAT_MORNING_GIFT, (worldserver, itemstack) -> { this.cat.dropFromGiftLootTable(getServerLevel((Entity) this.cat), BuiltInLootTables.CAT_MORNING_GIFT, (worldserver, itemstack) -> {
@@ -57,7 +71,7 @@
}); });
} }
@@ -645,10 +653,10 @@ @@ -645,10 +660,10 @@
private final Cat cat; private final Cat cat;
public CatAvoidEntityGoal(Cat cat, Class<T> fleeFromType, float distance, double slowSpeed, double fastSpeed) { public CatAvoidEntityGoal(Cat cat, Class<T> fleeFromType, float distance, double slowSpeed, double fastSpeed) {

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

@@ -80,7 +80,22 @@
return InteractionResult.SUCCESS; return InteractionResult.SUCCESS;
} else { } else {
if (item instanceof DyeItem) { if (item instanceof DyeItem) {
@@ -440,7 +458,9 @@ @@ -414,6 +432,14 @@
DyeColor enumcolor = itemdye.getDyeColor();
if (enumcolor != 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) enumcolor.getId()), ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity());
+ if (!event.callEvent()) {
+ return InteractionResult.FAIL;
+ }
+ enumcolor = DyeColor.byId(event.getColor().getWoolData());
+ // Paper end - Add EntityDyeEvent and CollarColorable interface
+
this.setCollarColor(enumcolor);
itemstack.consume(1, player);
return InteractionResult.SUCCESS;
@@ -440,7 +466,9 @@
if (world instanceof ServerLevel) { if (world instanceof ServerLevel) {
ServerLevel worldserver = (ServerLevel) world; ServerLevel worldserver = (ServerLevel) world;
@@ -90,7 +105,7 @@
} }
return InteractionResult.SUCCESS; return InteractionResult.SUCCESS;
@@ -459,7 +479,7 @@ @@ -459,7 +487,7 @@
this.setOrderedToSit(!this.isOrderedToSit()); this.setOrderedToSit(!this.isOrderedToSit());
this.jumping = false; this.jumping = false;
this.navigation.stop(); this.navigation.stop();
@@ -99,7 +114,7 @@
return InteractionResult.SUCCESS.withoutItem(); return InteractionResult.SUCCESS.withoutItem();
} else { } else {
return enuminteractionresult; return enuminteractionresult;
@@ -477,7 +497,8 @@ @@ -477,7 +505,8 @@
} }
private void tryToTame(Player player) { private void tryToTame(Player player) {