spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2023-06-24 17:19:51 +10:00
parent c62f4bd99c
commit 64b565e634
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
8 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From 650ac4c6c14bb7521e5f676b286a492706efed3b Mon Sep 17 00:00:00 2001
From eaeda7fd45516044420c4db233d750855de0188d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@ -6,10 +6,10 @@ Subject: [PATCH] Merge tweaks and configuration
This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
index 1d4abea14..0ee3d963c 100644
index d4f6aeced..15d0290ba 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -219,7 +219,10 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -221,7 +221,10 @@ public class EntityItem extends Entity implements TraceableEntity {
private void mergeWithNeighbours() {
if (this.isMergable()) {
@ -21,7 +21,7 @@ index 1d4abea14..0ee3d963c 100644
return entityitem != this && entityitem.isMergable();
});
Iterator iterator = list.iterator();
@@ -249,7 +252,7 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -251,7 +254,7 @@ public class EntityItem extends Entity implements TraceableEntity {
ItemStack itemstack1 = entityitem.getItem();
if (Objects.equals(this.target, entityitem.target) && areMergable(itemstack, itemstack1)) {
@ -31,10 +31,10 @@ index 1d4abea14..0ee3d963c 100644
} else {
merge(entityitem, itemstack1, this, itemstack);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 222a92eb8..90a150ced 100644
index ae5439e1d..ecf42710f 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -651,6 +651,23 @@ public class CraftEventFactory {
@@ -664,6 +664,23 @@ public class CraftEventFactory {
return true;
}
event = CraftEventFactory.callLightningStrikeEvent((LightningStrike) entity.getBukkitEntity(), cause);
@ -82,5 +82,5 @@ index f42972427..5ff085b9e 100644
+ }
}
--
2.40.1
2.41.0

28
CraftBukkit-Patches/0008-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 704099493e403a10deac15f9db10ebbfff922c9c Mon Sep 17 00:00:00 2001
From 6f0d86384303fd346c1f64c3748c5b3d9ba518d9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -282,7 +282,7 @@ index 06d5cfc28..dc84b6954 100644
}
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index c1062f73c..5586c4dc0 100644
index c39ee457e..8dbd7e9ae 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -340,6 +340,7 @@ public class PlayerConnection implements ServerPlayerConnection, TickablePacketL
@ -327,7 +327,7 @@ index c1062f73c..5586c4dc0 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d6c62c1ed..9a8a317a6 100644
index 5cab1415e..774b49e6b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -136,6 +136,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -363,7 +363,7 @@ index d6c62c1ed..9a8a317a6 100644
private boolean isStateClimbable(IBlockData iblockdata) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index e70bf3394..a1a7552ea 100644
index a7110e06c..5f04515ef 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -143,6 +143,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -375,7 +375,7 @@ index e70bf3394..a1a7552ea 100644
public abstract class EntityLiving extends Entity implements Attackable {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -2836,6 +2838,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -2827,6 +2829,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@Override
public void tick() {
@ -383,7 +383,7 @@ index e70bf3394..a1a7552ea 100644
super.tick();
this.updatingUsingItem();
this.updateSwimAmount();
@@ -2877,7 +2880,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -2868,7 +2871,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
}
if (!this.isRemoved()) {
@ -393,7 +393,7 @@ index e70bf3394..a1a7552ea 100644
}
double d0 = this.getX() - this.xo;
@@ -2960,6 +2965,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -2951,6 +2956,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.setXRot(0.0F);
}
@ -401,7 +401,7 @@ index e70bf3394..a1a7552ea 100644
}
public void detectEquipmentUpdates() {
@@ -3137,6 +3143,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3128,6 +3134,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.setDeltaMovement(d4, d5, d6);
this.level().getProfiler().push("ai");
@ -409,7 +409,7 @@ index e70bf3394..a1a7552ea 100644
if (this.isImmobile()) {
this.jumping = false;
this.xxa = 0.0F;
@@ -3146,6 +3153,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3137,6 +3144,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.serverAiStep();
this.level().getProfiler().pop();
}
@ -417,7 +417,7 @@ index e70bf3394..a1a7552ea 100644
this.level().getProfiler().pop();
this.level().getProfiler().push("jump");
@@ -3185,6 +3193,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3176,6 +3184,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.resetFallDistance();
}
@ -425,7 +425,7 @@ index e70bf3394..a1a7552ea 100644
label104:
{
EntityLiving entityliving = this.getControllingPassenger();
@@ -3200,6 +3209,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3191,6 +3200,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.travel(vec3d1);
}
@ -433,7 +433,7 @@ index e70bf3394..a1a7552ea 100644
this.level().getProfiler().pop();
this.level().getProfiler().push("freezing");
@@ -3226,7 +3236,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3217,7 +3227,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
}
@ -591,7 +591,7 @@ index 570f62854..c66df1e7a 100644
};
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 223f399cd..698570c89 100644
index 50735f714..afb26ee98 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2351,6 +2351,11 @@ public final class CraftServer implements Server {
@ -830,5 +830,5 @@ index c885bc744..70794669f 100644
+ // Spigot end
}
--
2.40.1
2.41.0

12
CraftBukkit-Patches/0011-Item-Despawn-Rate.patch
View file

@ -1,23 +1,23 @@
From 496db398eab989dc73d4e836bd61c1bd2743f80c Mon Sep 17 00:00:00 2001
From bc9f4e6e654376e8355bf808ef4a31250ec1fe19 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 22 Sep 2013 19:10:53 +1000
Subject: [PATCH] Item Despawn Rate
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
index 0ee3d963c..50045178c 100644
index 15d0290ba..8e26d92c4 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -187,7 +187,7 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -189,7 +189,7 @@ public class EntityItem extends Entity implements TraceableEntity {
}
}
- if (!this.level().isClientSide && this.age >= 6000) {
+ if (!this.level().isClientSide && this.age >= this.level().spigotConfig.itemDespawnRate) { // Spigot
// CraftBukkit start - fire ItemDespawnEvent
if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
if (CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
this.age = 0;
@@ -513,7 +513,7 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -518,7 +518,7 @@ public class EntityItem extends Entity implements TraceableEntity {
public void makeFakeItem() {
this.setNeverPickUp();
@ -43,5 +43,5 @@ index 0c0c29efe..e3682d28c 100644
+ }
}
--
2.40.1
2.41.0

16
CraftBukkit-Patches/0012-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From e80ddc0cc7230ef0aa6bd0640a95a1424f9e5c37 Mon Sep 17 00:00:00 2001
From 50108f875e2b600010f3d5563433c951f3e1816c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -35,7 +35,7 @@ index dc84b6954..52957c25e 100644
entity.setOldPosAndRot();
GameProfilerFiller gameprofilerfiller = this.getProfiler();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9a8a317a6..4c7f98f27 100644
index 774b49e6b..6a5b0dbd6 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -310,6 +310,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@ -102,10 +102,10 @@ index bd2e7ba4e..a64ea7677 100644
public GroupDataEntity finalizeSpawn(WorldAccess worldaccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
if (groupdataentity == null) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/EntityAreaEffectCloud.java
index 1459e28ea..a32d71ac5 100644
index ea4b295bd..79d87b105 100644
--- a/src/main/java/net/minecraft/world/entity/EntityAreaEffectCloud.java
+++ b/src/main/java/net/minecraft/world/entity/EntityAreaEffectCloud.java
@@ -184,6 +184,18 @@ public class EntityAreaEffectCloud extends Entity implements TraceableEntity {
@@ -168,6 +168,18 @@ public class EntityAreaEffectCloud extends Entity implements TraceableEntity {
this.duration = i;
}
@ -125,7 +125,7 @@ index 1459e28ea..a32d71ac5 100644
public void tick() {
super.tick();
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index a1a7552ea..1cc26fad9 100644
index 5f04515ef..3a9f947e4 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -267,6 +267,13 @@ public abstract class EntityLiving extends Entity implements Attackable {
@ -143,10 +143,10 @@ index a1a7552ea..1cc26fad9 100644
protected EntityLiving(EntityTypes<? extends EntityLiving> entitytypes, World world) {
super(entitytypes, world);
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
index 50045178c..effde300b 100644
index 8e26d92c4..fa2c895d2 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -200,6 +200,28 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -202,6 +202,28 @@ public class EntityItem extends Entity implements TraceableEntity {
}
}
@ -556,5 +556,5 @@ index e3682d28c..936279b5f 100644
+ }
}
--
2.40.1
2.41.0

18
CraftBukkit-Patches/0022-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,17 +1,17 @@
From 0e30614b2140e701cdb280b7d8bbf9f30cd0897e Mon Sep 17 00:00:00 2001
From 88bb8eae774c6559976ae485f40f530a89067e7e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 27 Feb 2016 10:07:58 +1100
Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 84b17c7a1..912cade1c 100644
index 6a5b0dbd6..800bee8aa 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2382,6 +2382,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -2342,6 +2342,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
return false;
}
}
// CraftBukkit end
+ // Spigot start
+ org.spigotmc.event.entity.EntityMountEvent event = new org.spigotmc.event.entity.EntityMountEvent(entity.getBukkitEntity(), this.getBukkitEntity());
+ // Suppress during worldgen
@ -22,10 +22,10 @@ index 84b17c7a1..912cade1c 100644
+ return false;
+ }
+ // Spigot end
if (this.passengers.isEmpty()) {
this.passengers = ImmutableList.of(entity);
} else {
@@ -2424,6 +2434,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
return result;
// CraftBukkit end
@@ -2417,6 +2427,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
}
// CraftBukkit end
@ -43,5 +43,5 @@ index 84b17c7a1..912cade1c 100644
this.passengers = ImmutableList.of();
} else {
--
2.40.1
2.41.0

8
CraftBukkit-Patches/0064-Safer-JSON-Loading.patch
View file

@ -1,14 +1,14 @@
From 305f6610f216ff0d2fb9f18a962a494cf3094ccc Mon Sep 17 00:00:00 2001
From bc2d5061efb021770ecb59c1fea007d1599eca6c Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee>
Date: Tue, 8 Jul 2014 09:44:18 +1000
Subject: [PATCH] Safer JSON Loading
diff --git a/src/main/java/net/minecraft/server/players/JsonList.java b/src/main/java/net/minecraft/server/players/JsonList.java
index 1220c2e88..86fb74deb 100644
index f47e588d7..6e55bb4ba 100644
--- a/src/main/java/net/minecraft/server/players/JsonList.java
+++ b/src/main/java/net/minecraft/server/players/JsonList.java
@@ -174,6 +174,14 @@ public abstract class JsonList<K, V extends JsonListEntry<K>> {
@@ -169,6 +169,14 @@ public abstract class JsonList<K, V extends JsonListEntry<K>> {
this.map.put(this.getKeyForUser(jsonlistentry.getUser()), (V) jsonlistentry); // CraftBukkit - decompile error
}
}
@ -40,5 +40,5 @@ index 1295a3340..3abeb707c 100644
UserCache.LOGGER.warn("Failed to load profile cache {}", this.file, ioexception);
}
--
2.40.1
2.41.0

8
CraftBukkit-Patches/0076-Limit-TNT-Detonations-per-tick.patch
View file

@ -1,4 +1,4 @@
From ea18079e2ae41b0e9150648e377669cc729d731e Mon Sep 17 00:00:00 2001
From f2a9cd376636209d6f4384798f3aded96bcc5e9b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick
@ -7,10 +7,10 @@ This gives a per-world control on how much TNT will be processed per-tick,
preventing a massive TNT detonation from lagging out the server.
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java b/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
index ee50be388..971696eef 100644
index 1bae42cf5..9cf5994f7 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
@@ -61,6 +61,7 @@ public class EntityTNTPrimed extends Entity implements TraceableEntity {
@@ -64,6 +64,7 @@ public class EntityTNTPrimed extends Entity implements TraceableEntity {
@Override
public void tick() {
@ -51,5 +51,5 @@ index 1b5d1e283..8411f9e57 100644
+ }
}
--
2.40.1
2.41.0

8
CraftBukkit-Patches/0086-Add-log-villager-deaths-option.patch
View file

@ -1,14 +1,14 @@
From 877dfc3a2928c20f1f7f99acad37ed412425d33d Mon Sep 17 00:00:00 2001
From 928e7c7f06f8aaf29ab4c64c0d9a8d687ee043cc Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 14 Dec 2019 10:26:52 +1100
Subject: [PATCH] Add log-villager-deaths option
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 1cc26fad9..ade10af0a 100644
index 3a9f947e4..0c2734023 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -1652,7 +1652,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -1643,7 +1643,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
}
if (!this.level().isClientSide && this.hasCustomName()) {
@ -47,5 +47,5 @@ index b99e43352..867dd16bf 100644
+ }
}
--
2.40.1
2.41.0