mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-22 16:39:30 +00:00
Update Paper
This commit is contained in:
@@ -375,7 +375,7 @@ index eb3c12e03c0d5c9cec84d97e2c51c50ce59c23a4..0593d76c67f4475d624c5289b65c5d4a
|
||||
private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int armorStandId, final String name) {
|
||||
this.type = type;
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 3ad2f5234925e7f454d2b2bcb507493cdc3e454a..bd85c526a285e0b11c0c8f87fd9ea95ccb9f70a3 100644
|
||||
index f1a989919f563b3f424d3ba7ebecb10ac56c4ecb..f8187085df596c296d92ff43a1f02fed3732437c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -3238,7 +3238,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
@@ -388,7 +388,7 @@ index 3ad2f5234925e7f454d2b2bcb507493cdc3e454a..bd85c526a285e0b11c0c8f87fd9ea95c
|
||||
|
||||
for (int j = 0; j < i; ++j) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
index 22a5e441cd62447e4ac95a8b048bd10942743367..9821e8fc3209eabfa809560bcca36c3a7e5cdc25 100644
|
||||
index 18a7b57a7e45fc9c412c5b203d686e896ddddd06..4486a84b10c20515f18efce522e58c92a9591b65 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
@@ -1201,7 +1201,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
|
||||
@@ -454,7 +454,7 @@ index cb5effe8be9f43ef6b3fa48c25600cdcd69ddc9e..98c6c0b5e795558fc9d1b96643832b3c
|
||||
|
||||
for (int j = 0; j < i; ++j) {
|
||||
diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
|
||||
index 482d7b12b80328fba97a01bcfeb974b7ac4bcdb7..8068816a64ff9a30476280f53bb60cf0e1fff8ee 100644
|
||||
index fb4c8a2a15e8e3e26454b7da920454e9861336c6..af13503a1e6e25893889705a48cef60d99a7e04f 100644
|
||||
--- a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
|
||||
+++ b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
|
||||
@@ -17,6 +17,7 @@ import org.bukkit.craftbukkit.inventory.CraftRecipe;
|
||||
@@ -496,7 +496,7 @@ index e158ff1a9dbd054985873e854fcf6c433102059c..e061322fed6adf49a506ea13db50cdf2
|
||||
private static Enchantment register(String name, Enchantment enchantment) {
|
||||
return Registry.register(BuiltInRegistries.ENCHANTMENT, name, enchantment);
|
||||
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||||
index c04e07fa16d701d814a2df82758d4339e3b4e5f1..fdf56caa8756f065f892847898f2b2b9af18f5c6 100644
|
||||
index fc956d2d81f9b7625c7143810c77c8ab8e86ec5c..c7f740be91ecbf9cb3baa30ae02b5751454fc23d 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||||
@@ -101,6 +101,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;
|
||||
@@ -507,7 +507,7 @@ index c04e07fa16d701d814a2df82758d4339e3b4e5f1..fdf56caa8756f065f892847898f2b2b9
|
||||
|
||||
public abstract class Level implements LevelAccessor, AutoCloseable {
|
||||
|
||||
@@ -1868,7 +1869,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||||
@@ -1859,7 +1860,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||||
public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) {
|
||||
io.papermc.paper.world.ChunkEntitySlices slices = ((ServerLevel)this).getEntityLookup().getChunk(chunkX, chunkZ);
|
||||
if (slices == null) {
|
||||
@@ -610,7 +610,7 @@ index ae86c45c1d49c7646c721991910592091e7333f8..f3dce7156d518193fe27a69f5792800b
|
||||
static {
|
||||
set(EquipmentSlot.HAND, net.minecraft.world.entity.EquipmentSlot.MAINHAND);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
||||
index 6827979a5b270ced53b46ecb9eff548727dadb81..1b84078152d0585ec51288e585754be176f2d7c2 100644
|
||||
index fdcc414f4fa246082ad0732133c870d915ae3084..556247696cde0d31cbb70907648d2970acf81153 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
||||
@@ -165,7 +165,7 @@ public class CraftEntityEquipment implements EntityEquipment {
|
||||
|
||||
Reference in New Issue
Block a user