mirror of
https://github.com/PaperMC/Paper.git
synced 2025-04-28 14:45:08 +02:00
Remove some patches
This commit is contained in:
parent
b32a34c71d
commit
d3f1bc04b4
788 changed files with 21 additions and 32 deletions
patches
removed/1.20.3
0268-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch0395-Optimize-brigadier-child-sorting-performance.patch
server
0068-Handle-Item-Meta-Inconsistencies.patch0227-Don-t-call-getItemMeta-on-hasItemMeta.patch0268-Add-more-Witch-API.patch0269-Check-Drowned-for-Villager-Aggression-Config.patch0270-Add-option-to-prevent-players-from-moving-into-unloa.patch0271-Reset-players-airTicks-on-respawn.patch0272-Don-t-sleep-after-profile-lookups-if-not-needed.patch0273-Improve-Server-Thread-Pool-and-Thread-Priorities.patch0274-Optimize-World-Time-Updates.patch0275-Restore-custom-InventoryHolder-support.patch0276-Use-Vanilla-Minecart-Speeds.patch0277-Fix-SpongeAbsortEvent-handling.patch0278-Don-t-allow-digging-into-unloaded-chunks.patch0279-Make-the-default-permission-message-configurable.patch0280-Prevent-rayTrace-from-loading-chunks.patch0281-Handle-Large-Packets-disconnecting-client.patch0282-force-entity-dismount-during-teleportation.patch0283-Add-more-Zombie-API.patch0284-Book-Size-Limits.patch0285-Add-PlayerConnectionCloseEvent.patch0286-Prevent-Enderman-from-loading-chunks.patch0287-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch0288-Workaround-for-vehicle-tracking-issue-on-disconnect.patch0289-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch0290-BlockDestroyEvent.patch0291-Async-command-map-building.patch0292-Implement-Brigadier-Mojang-API.patch0293-Improve-exact-choice-recipe-ingredients.patch0294-Limit-Client-Sign-length-more.patch0295-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch0296-Handle-Oversized-Tile-Entities-in-chunks.patch0297-Entity-getEntitySpawnReason.patch0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch0299-Fire-event-on-GS4-query.patch0300-Implement-PlayerPostRespawnEvent.patch0301-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch0302-Server-Tick-Events.patch0303-PlayerDeathEvent-getItemsToKeep.patch0304-Optimize-Captured-TileEntity-Lookup.patch0305-Add-Heightmap-API.patch0306-Mob-Spawner-API-Enhancements.patch0307-Fix-CB-call-to-changed-postToMainThread-method.patch0308-Fix-sounds-when-item-frames-are-modified-MC-123450.patch0309-Implement-CraftBlockSoundGroup.patch0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch0311-Allow-Saving-of-Oversized-Chunks.patch0312-Expose-the-internal-current-tick.patch0313-Fix-World-isChunkGenerated-calls.patch0314-Show-blockstate-location-if-we-failed-to-read-it.patch0315-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch0316-Configurable-projectile-relative-velocity.patch0317-offset-item-frame-ticking.patch0318-Fix-MC-158900.patch0319-Prevent-consuming-the-wrong-itemstack.patch0320-Dont-send-unnecessary-sign-update.patch0321-Add-option-to-disable-pillager-patrols.patch0322-Flat-bedrock-generator-settings.patch0323-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch0324-MC-145656-Fix-Follow-Range-Initial-Target.patch0325-Duplicate-UUID-Resolve-Option.patch0326-PlayerDeathEvent-shouldDropExperience.patch0327-Prevent-bees-loading-chunks-checking-hive-position.patch0328-Don-t-load-Chunks-from-Hoppers-and-other-things.patch0329-Optimise-EntityGetter-getPlayerByUUID.patch0330-Fix-items-not-falling-correctly.patch0331-Optimize-call-to-getFluid-for-explosions.patch0332-Fix-last-firework-in-stack-not-having-effects-when-d.patch0333-Entity-Activation-Range-2.0.patch0334-Guard-against-serializing-mismatching-chunk-coordina.patch0335-Implement-alternative-item-despawn-rate.patch0336-Tracking-Range-Improvements.patch0337-Fix-items-vanishing-through-end-portal.patch0338-implement-optional-per-player-mob-spawns.patch0339-Anti-Xray.patch0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch0341-Improve-Block-breakNaturally-API.patch0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch0343-Add-debug-for-sync-chunk-loads.patch0344-Improve-java-version-check.patch0345-Add-ThrownEggHatchEvent.patch0346-Entity-Jump-API.patch0347-Add-option-to-nerf-pigmen-from-nether-portals.patch0348-Make-the-GUI-graph-fancier.patch0349-add-hand-to-BlockMultiPlaceEvent.patch0350-Validate-tripwire-hook-placement-before-update.patch0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch0352-Configurable-chance-of-villager-zombie-infection.patch0353-Optimise-Chunk-getFluid.patch0354-Set-spigots-verbose-world-setting-to-false-by-def.patch0355-Add-tick-times-API-and-mspt-command.patch0356-Expose-MinecraftServer-isRunning.patch0357-Add-Raw-Byte-ItemStack-Serialization.patch0358-Pillager-patrol-spawn-settings-and-per-player-option.patch0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch0362-Don-t-tick-dead-players.patch0363-Dead-Player-s-shouldn-t-be-able-to-move.patch
|
@ -70,7 +70,7 @@ index 9861cd23b07f8fbacb1d125af835dee58c2debbb..e6a47317eb24fc65ed02a4d4f9c4b19b
|
|||
|
||||
public boolean isEnchanted() {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
index 7278ac809eff364e8b838d63a2ec1291493869f8..ee5989e52ce0b55d8bf867ab10801ba3252c88a5 100644
|
||||
index 7278ac809eff364e8b838d63a2ec1291493869f8..0003d6508b0bd75130a3e0e21e252c5dc23a903c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
@@ -188,28 +188,11 @@ public final class CraftItemStack extends ItemStack {
|
||||
|
@ -107,23 +107,12 @@ index 7278ac809eff364e8b838d63a2ec1291493869f8..ee5989e52ce0b55d8bf867ab10801ba3
|
|||
}
|
||||
|
||||
static boolean makeTag(net.minecraft.world.item.ItemStack item) {
|
||||
@@ -235,57 +218,40 @@ public final class CraftItemStack extends ItemStack {
|
||||
@@ -235,57 +218,29 @@ public final class CraftItemStack extends ItemStack {
|
||||
if (this.handle == null) {
|
||||
return 0;
|
||||
}
|
||||
- return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.bukkitToMinecraft(ench), this.handle);
|
||||
+ // Paper start - replace to allow custom enchantments
|
||||
+ final ListTag enchantments = this.handle.getEnchantmentTags();
|
||||
+ for (int i = 0; i < enchantments.size(); i++) {
|
||||
+ final CompoundTag tag = enchantments.getCompound(i);
|
||||
+ final String id = tag.getString(CraftMetaItem.ENCHANTMENTS_ID.NBT);
|
||||
+ final Enchantment enchant = Enchantment.getByKey(CraftNamespacedKey.fromStringOrNull(id));
|
||||
+ if (ench.equals(enchant)) {
|
||||
+ return EnchantmentHelper.getEnchantmentLevel(tag);
|
||||
+ }
|
||||
+ }
|
||||
+ return 0;
|
||||
+ // Paper end - replace to allow custom enchantments
|
||||
+ return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.getRaw(ench), handle);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
|
|||
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
index 550d3290c974eebdeb4bf9b90987448c5d3d2999..93a9d53c29d9b359d9d8618254085b7fcebe8cdf 100644
|
||||
index 36bc8d587ef39baf4c85b30578d3066cb36ded21..1cd7a7ab18dca87090e7aba9c0683f937fdb6188 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
@@ -681,7 +681,7 @@ public final class CraftItemStack extends ItemStack {
|
||||
@@ -670,7 +670,7 @@ public final class CraftItemStack extends ItemStack {
|
||||
|
||||
@Override
|
||||
public boolean hasItemMeta() {
|
||||
|
|
|
@ -25,10 +25,10 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
|
|||
server-internal fix makes this change future-proof.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||||
index fec4897ffc07f71efb8725efea341ba2878a1462..621cb07c02cf318bf1b72c14724a42e0987d5b2f 100644
|
||||
index 01a2c6c3ee4e1500b6ee9986943f84dbe8663860..444119c813af920eb25706341106f0fea27befa8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||||
@@ -185,7 +185,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
|
||||
@@ -173,7 +173,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
|
||||
this.shoot((double) f5, (double) f6, (double) f7, speed, divergence);
|
||||
Vec3 vec3d = shooter.getDeltaMovement();
|
||||
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue