mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
72 lines
3.5 KiB
Diff
72 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 22 Apr 2021 00:28:11 -0700
|
|
Subject: [PATCH] add get-set drop chance to EntityEquipment
|
|
|
|
== AT ==
|
|
public net.minecraft.world.entity.Mob getEquipmentDropChance(Lnet/minecraft/world/entity/EquipmentSlot;)F
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
|
index cb704cef3845727c465fe3ea7210a11545da56c8..fdcc414f4fa246082ad0732133c870d915ae3084 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
|
@@ -244,15 +244,22 @@ public class CraftEntityEquipment implements EntityEquipment {
|
|
public void setBootsDropChance(float chance) {
|
|
this.setDropChance(net.minecraft.world.entity.EquipmentSlot.FEET, chance);
|
|
}
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public float getDropChance(EquipmentSlot slot) {
|
|
+ return getDropChance(CraftEquipmentSlot.getNMS(slot));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setDropChance(EquipmentSlot slot, float chance) {
|
|
+ setDropChance(CraftEquipmentSlot.getNMS(slot), chance);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
private void setDropChance(net.minecraft.world.entity.EquipmentSlot slot, float chance) {
|
|
Preconditions.checkArgument(this.entity.getHandle() instanceof Mob, "Cannot set drop chance for non-Mob entity");
|
|
|
|
- if (slot == net.minecraft.world.entity.EquipmentSlot.MAINHAND || slot == net.minecraft.world.entity.EquipmentSlot.OFFHAND) {
|
|
- ((Mob) this.entity.getHandle()).handDropChances[slot.getIndex()] = chance;
|
|
- } else {
|
|
- ((Mob) this.entity.getHandle()).armorDropChances[slot.getIndex()] = chance;
|
|
- }
|
|
+ ((Mob) this.entity.getHandle()).setDropChance(slot, chance); // Paper - use setter on Mob
|
|
}
|
|
|
|
private float getDropChance(net.minecraft.world.entity.EquipmentSlot slot) {
|
|
@@ -260,10 +267,6 @@ public class CraftEntityEquipment implements EntityEquipment {
|
|
return 1;
|
|
}
|
|
|
|
- if (slot == net.minecraft.world.entity.EquipmentSlot.MAINHAND || slot == net.minecraft.world.entity.EquipmentSlot.OFFHAND) {
|
|
- return ((Mob) this.entity.getHandle()).handDropChances[slot.getIndex()];
|
|
- } else {
|
|
- return ((Mob) this.entity.getHandle()).armorDropChances[slot.getIndex()];
|
|
- }
|
|
+ return ((Mob) this.entity.getHandle()).getEquipmentDropChance(slot); // Paper - use getter on Mob
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
index f039c5041e783ef55e19194cb7db7610429b1d96..107fa1d4bd977d17dc062da280dda46eb3c5f81c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
@@ -353,4 +353,15 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
|
|
public void setBootsDropChance(float chance) {
|
|
throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
|
|
}
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public float getDropChance(EquipmentSlot slot) {
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setDropChance(EquipmentSlot slot, float chance) {
|
|
+ throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
|
|
+ }
|
|
+ // Paper end
|
|
}
|