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
|
2023-09-22 17:24:59 +02:00
|
|
|
index a744cb70ac719eae376fb2ab2271e4f8ac7b12f2..40af8405c6f3ecc5a8168bb62607eb79862cefa6 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
|
2023-09-22 17:24:59 +02:00
|
|
|
@@ -402,6 +402,13 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
|
2022-04-23 21:38:42 +02:00
|
|
|
DyeColor enumcolor = ((DyeItem) item).getDyeColor();
|
|
|
|
|
|
|
|
if (enumcolor != this.getCollarColor()) {
|
|
|
|
+ // Paper start
|
|
|
|
+ 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
|
|
|
|
this.setCollarColor(enumcolor);
|
|
|
|
if (!player.getAbilities().instabuild) {
|
|
|
|
itemstack.shrink(1);
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
2023-09-22 17:24:59 +02:00
|
|
|
index 9ebb994b62b58352525da21385f02803e8414687..eecb7511582e5e316b71fa4a4734881424be5ca7 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
|
2023-09-22 17:24:59 +02:00
|
|
|
@@ -369,6 +369,14 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
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()) {
|
|
|
|
+ // Paper start
|
|
|
|
+ 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
|
|
|
|
+
|
|
|
|
this.setCollarColor(enumcolor);
|
|
|
|
if (!player.getAbilities().instabuild) {
|
|
|
|
itemstack.shrink(1);
|