mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-22 16:39:30 +00:00
Update Paper
This commit is contained in:
@@ -227,7 +227,7 @@ index b0517b9483a8cfd74997f89efdc0d8559b80ae4a..e7cfc98aa6dc19c5adad4c797ae7292a
|
||||
|
||||
for (int j = 0; j < i; ++j) {
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
index c0ebba04b41628f691ab55853498df258549e939..8ce9c990d9db973ea2bb80a58fa9002a6f1793b0 100644
|
||||
index aa6bf9361144679821adf1b090abcef34115d1fc..f836228eb76b53944c127d2e5b759d9e89b02699 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -172,6 +172,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
|
||||
@@ -257,7 +257,7 @@ index c0ebba04b41628f691ab55853498df258549e939..8ce9c990d9db973ea2bb80a58fa9002a
|
||||
return ret;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index d697624df09cc485b5e8c680153f78f03195dbe7..49296a14d6b1471fa0b92c7bfbb715a434af33b8 100644
|
||||
index 9c290bb9698ba29f04e82edf892d3a189312b2f4..ebfe7088ee04e9bc45b57a29d3767d6997fbfe38 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -239,6 +239,7 @@ import org.bukkit.inventory.EquipmentSlot;
|
||||
@@ -294,7 +294,7 @@ index d697624df09cc485b5e8c680153f78f03195dbe7..49296a14d6b1471fa0b92c7bfbb715a4
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
||||
index ff2dd53e9e943aa929188fd9d4c35498b78c497a..3ccd8d80344a436bf4db6e119453adac40fdc2b9 100644
|
||||
index 1c4f272219e68373eaae93fc5ea9af7d8f3fd6f9..e6834c3388cba6d014871efb3ab2b9538ca18c3f 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
||||
@@ -43,6 +43,7 @@ import org.bukkit.craftbukkit.util.Waitable;
|
||||
@@ -328,7 +328,7 @@ index ff2dd53e9e943aa929188fd9d4c35498b78c497a..3ccd8d80344a436bf4db6e119453adac
|
||||
final String s;
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
index 16ce16049f6ee6d989606495d022af6ff893a695..234abc2192339c3e28a53561b05578fb0847d5d9 100644
|
||||
index 10892eb3b1b0ce8ea197e2232f44bc29b73c8902..9af2f9ad9bdf483b4763c8b2d4573b04532d95d1 100644
|
||||
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
@@ -123,6 +123,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
|
||||
@@ -398,10 +398,10 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8d949983a30f27a60982f6b406151408
|
||||
private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, 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 77efccddeb270de69083a1dd5fc1c8abbece7f0d..109861edf227f88b2dfc1baa8ff494fc1fb5a8d6 100644
|
||||
index 9032a4c498c5081dba216077e502fe1798c71dfc..edc782045b002de631fdc432f68848b1f85dd363 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -3141,7 +3141,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
@@ -3138,7 +3138,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
@Nullable
|
||||
private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
|
||||
Map<EquipmentSlot, ItemStack> map = null;
|
||||
@@ -451,7 +451,7 @@ index 48889d29c94dc09030d5c9825d3b0a637e660b0e..c7475a368efd82d0b1e407c9addc0aee
|
||||
|
||||
for (int j = 0; j < i; ++j) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
index 807cff3fb51269b97d9aecbcc4706f0a139dfeaa..459cfde5cf1fc619b186e2adfbd252bd12720990 100644
|
||||
index 94396ad1a3c280787d36c6c18256d10340ace488..ae0de0d0cb970a10a8a612cf34810a3613ac6c73 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
@@ -237,7 +237,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
@@ -515,7 +515,7 @@ index 2bfbdaeb2b0d99dfd956cd5936403fe8b0eeae64..7ad1545631604aa55f6d4fbdcbaefe6d
|
||||
public Enchantments() {}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||||
index cb62c2b8b6cdd628037b67a58b3fbf7e5f1d0284..1f59cf27dc482a62592dd39e3ac755c29ed175ef 100644
|
||||
index cdfeb7f87efdfe689a43b3d13656c8f682b5400e..cabd335e0a52e992bb2e1fbd3215ee10715c993b 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||||
@@ -94,6 +94,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;
|
||||
@@ -655,7 +655,7 @@ index 6827979a5b270ced53b46ecb9eff548727dadb81..1b84078152d0585ec51288e585754be1
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java b/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java
|
||||
index bbacf58740f3faea0d555e4012fe2b15fb46ed50..97afd508898096e5c2e6401cf02b0be587f365d9 100644
|
||||
index b25dc23b81687dd4d4e70b3615ffb91f8c03c68b..9435ea991a429c1d81d4cba63231e846e3bd2b7e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java
|
||||
@@ -6,6 +6,7 @@ import java.util.ArrayList;
|
||||
|
||||
Reference in New Issue
Block a user