2022-04-23 21:38:42 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Fri, 18 Mar 2022 21:15:55 -0700
|
|
|
|
Subject: [PATCH] Add EntityDyeEvent and CollarColorable interface
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
2024-06-14 03:30:23 +02:00
|
|
|
index d44807c16712afd37efdbf434d1afb12a7c3d343..2ed442c8d36f285420cf84a956e90b6036384ce0 100644
|
2022-04-23 21:38:42 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
2024-06-14 03:30:23 +02:00
|
|
|
@@ -378,6 +378,13 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
|
2024-04-24 22:05:42 +02:00
|
|
|
DyeColor enumcolor = itemdye.getDyeColor();
|
2022-04-23 21:38:42 +02:00
|
|
|
|
|
|
|
if (enumcolor != this.getCollarColor()) {
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper start - Add EntityDyeEvent and CollarColorable interface
|
2022-04-23 21:38:42 +02:00
|
|
|
+ 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());
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper end - Add EntityDyeEvent and CollarColorable interface
|
2024-04-24 22:05:42 +02:00
|
|
|
if (!this.level().isClientSide()) {
|
|
|
|
this.setCollarColor(enumcolor);
|
|
|
|
itemstack.consume(1, player);
|
2022-04-23 21:38:42 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
2024-06-14 03:30:23 +02:00
|
|
|
index 26b050599984ae3ba3827a0cabab255374e38c1e..c382a8f95f612db881b9cdbd07316d1ca1cd9c4b 100644
|
2022-04-23 21:38:42 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
2024-06-14 03:30:23 +02:00
|
|
|
@@ -451,6 +451,14 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
|
2023-06-08 10:47:19 +02:00
|
|
|
DyeColor enumcolor = itemdye.getDyeColor();
|
2022-04-23 21:38:42 +02:00
|
|
|
|
2023-06-08 10:47:19 +02:00
|
|
|
if (enumcolor != this.getCollarColor()) {
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper start - Add EntityDyeEvent and CollarColorable interface
|
2023-06-08 10:47:19 +02:00
|
|
|
+ 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());
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper end - Add EntityDyeEvent and CollarColorable interface
|
2023-06-08 10:47:19 +02:00
|
|
|
+
|
|
|
|
this.setCollarColor(enumcolor);
|
2024-04-24 22:05:42 +02:00
|
|
|
itemstack.consume(1, player);
|
|
|
|
return InteractionResult.SUCCESS;
|