Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 02:50:09 +01:00
remove unneeded patch (#5641)
Dieser Commit ist enthalten in:
Ursprung
d875bacc28
Commit
e90e7829ee
@ -1,22 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Minecrell <minecrell@minecrell.net>
|
|
||||||
Date: Thu, 21 Sep 2017 16:33:35 +0200
|
|
||||||
Subject: [PATCH] Include Log4J2 SLF4J implementation
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
|
||||||
index 70a7778ae19941bb78b8669b1429cb3d525f58a4..3ebdf97dd88e9461331434da4a8cd02bd25148ca 100644
|
|
||||||
--- a/pom.xml
|
|
||||||
+++ b/pom.xml
|
|
||||||
@@ -83,6 +83,11 @@
|
|
||||||
<artifactId>log4j-api</artifactId>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
+ <dependency>
|
|
||||||
+ <groupId>org.apache.logging.log4j</groupId>
|
|
||||||
+ <artifactId>log4j-slf4j-impl</artifactId>
|
|
||||||
+ <scope>runtime</scope>
|
|
||||||
+ </dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
|
||||||
<artifactId>log4j-iostreams</artifactId>
|
|
@ -103,7 +103,7 @@ index 5047a742d2e6a9749aa7d37e761d023a3425944b..24486bc7290ec6ef1e00a94e289ca35b
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index c3058d6fca2fd58aea5001e4310592aa8bd20640..cf9ae60db30ef09bb4c89935a42632e562b6d61e 100644
|
index 3ab71629699f4978cd2dab36ec7e3b32a1681f91..b9a12d59e0144becc7e9c06d9a3c3079d006b583 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -188,6 +188,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -188,6 +188,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
index 851aed157a233ab690a57e5736fa01beaff45b5c..1dcdf9e328670b42d656e8ab65cb3da8a2312fe6 100644
|
index ff26ddce40d7ba74396360603a97bfab835b6202..8a43a85a728c15dbc0fdd2fc8dc5dfff9a589358 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
|
diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
|
||||||
index 5b96c69014dbfb8eb3e2ecf370ad69f2ffc31453..714f44a668eb35b3c61bb9ab140f884917efd6f5 100644
|
index 9e175747e110e32be80498ed27a71d21e8c01c5e..f95f5a8b30f42c8f5b6cee3ef6adb1f4e09832dc 100644
|
||||||
--- a/src/main/java/net/minecraft/server/network/LoginListener.java
|
--- a/src/main/java/net/minecraft/server/network/LoginListener.java
|
||||||
+++ b/src/main/java/net/minecraft/server/network/LoginListener.java
|
+++ b/src/main/java/net/minecraft/server/network/LoginListener.java
|
||||||
@@ -75,7 +75,11 @@ public class LoginListener implements PacketLoginInListener {
|
@@ -75,7 +75,11 @@ public class LoginListener implements PacketLoginInListener {
|
@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
|
|||||||
If Tile Entity was null, correct Sign to return empty lines instead of null
|
If Tile Entity was null, correct Sign to return empty lines instead of null
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
||||||
index fd6364dfc68c2eb9f560e7bc403dea874193828e..3ff9e389fcf15044c2740fb884c9438428d7a681 100644
|
index 9b44ca96669ce423e5649f11743226dfdd9ce746..48daa039ffa8ccb7b6f3ca47bdc56394addf9254 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
||||||
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
||||||
@@ -47,6 +47,7 @@ public abstract class TileEntity implements net.minecraft.server.KeyedObject { /
|
@@ -47,6 +47,7 @@ public abstract class TileEntity implements net.minecraft.server.KeyedObject { /
|
||||||
@ -56,7 +56,7 @@ index fd6364dfc68c2eb9f560e7bc403dea874193828e..3ff9e389fcf15044c2740fb884c94384
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||||
index 7654c0f8b57785225ecaa0c22e34c92f1d058d21..e4fe55bb830cd43680de9d61652448b1ea879063 100644
|
index 255aac0803b436434bc00822f3698c4f3ba7e0ac..8a6d8f21937ce7e2ac4623a3083421ed5ef9aa63 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||||
@@ -316,6 +316,20 @@ public class CraftBlock implements Block {
|
@@ -316,6 +316,20 @@ public class CraftBlock implements Block {
|
@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
|
|||||||
an OfflinePlayer to be loaded from disk.
|
an OfflinePlayer to be loaded from disk.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
||||||
index 8c59b9ce12d4148b209c3824d44f6e9c736de16c..218a2190d1203ca0fbc2a5ad87e145f436aac314 100644
|
index 62ccef35e4b4238c50faf778fbf3ea9a494ca387..5b66165471197aad57e23f9a6669b11f25a5e4f2 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
||||||
@@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
|
@@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
|
||||||
@ -21,7 +21,7 @@ index 8c59b9ce12d4148b209c3824d44f6e9c736de16c..218a2190d1203ca0fbc2a5ad87e145f4
|
|||||||
return getHandle().getOwnerUUID();
|
return getHandle().getOwnerUUID();
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
||||||
index 58d9cd8172dcb8d3df93355d8ff51053b7469c45..6a642155cf387f7d0e2cf9bdf1a78c62aef8205b 100644
|
index 3ac6623199f991ba16dbd62f4d6eed9982b22bcb..73a8ae346fb2ca5af172d96fa6b28e4d41a8c294 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
||||||
@@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
|
@@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
|
@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
|
|||||||
Item can be set inside of the Consumer pre spawn function.
|
Item can be set inside of the Consumer pre spawn function.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index 3855b8264d3223f3b1609a3cb81e009b1cd61268..f9af209170b5dccf425b2ca35c416ed61ccda3eb 100644
|
index 13d3b6accfb86383660a7d0e991519fd930bd518..2cc25177110d669e0f425668e26a38794c11c101 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -1515,6 +1515,10 @@ public class CraftWorld implements World {
|
@@ -1515,6 +1515,10 @@ public class CraftWorld implements World {
|
@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
|
|||||||
Allows you to determine how long it takes to use a usable/consumable item
|
Allows you to determine how long it takes to use a usable/consumable item
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||||
index 58045d500a6fbb7eb568f48c7d8ce7730d357577..c525afbc7d73488db2cae1501cdbe80ec05aeb7c 100644
|
index cac92ccacc9d5ff17c70ee266cf12bacce6242ea..2ac8b6ac38bdca26cddfb8652f13b0be0c4000fe 100644
|
||||||
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||||
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||||
@@ -606,6 +606,7 @@ public final class ItemStack {
|
@@ -606,6 +606,7 @@ public final class ItemStack {
|
@ -19,7 +19,7 @@ index e8e1e7dafaf1c105b2f58cf3e118e3d665dc50ec..3e4bd1d6718d3ad2498fe9bd72eaac45
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
index 1dcdf9e328670b42d656e8ab65cb3da8a2312fe6..9f6f6ac15688a1010d466e6f0cc3ac5b8297eb21 100644
|
index 8a43a85a728c15dbc0fdd2fc8dc5dfff9a589358..d4ffff5ecb24af8439e5bfaa02e8136a10fdde90 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
@@ -3311,7 +3311,7 @@ public abstract class EntityLiving extends Entity {
|
@@ -3311,7 +3311,7 @@ public abstract class EntityLiving extends Entity {
|
@ -19,7 +19,7 @@ index c22b5f8fcdd4aa7dac242f634ef73edcd8745fc6..41566398f5eee6cf93376f2e2200728b
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
index 9f6f6ac15688a1010d466e6f0cc3ac5b8297eb21..61bd7afdafc77725c24c6af978578df0b2d8ca0f 100644
|
index d4ffff5ecb24af8439e5bfaa02e8136a10fdde90..4798eac1498ebeecf0476a61a093d3871c00d5a5 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
@@ -1339,7 +1339,7 @@ public abstract class EntityLiving extends Entity {
|
@@ -1339,7 +1339,7 @@ public abstract class EntityLiving extends Entity {
|
@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
|
|||||||
Add Entity as a Source capability, and add more API choices, and on Location.
|
Add Entity as a Source capability, and add more API choices, and on Location.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index f9af209170b5dccf425b2ca35c416ed61ccda3eb..36c9ee703660d0ef558481ef0fea0984502bc14e 100644
|
index 2cc25177110d669e0f425668e26a38794c11c101..1fce5548544f00fd79839a23e05ec5690f6f0621 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -889,6 +889,11 @@ public class CraftWorld implements World {
|
@@ -889,6 +889,11 @@ public class CraftWorld implements World {
|
@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
|
|||||||
How long an entity has raised hands to charge an attack or use an item
|
How long an entity has raised hands to charge an attack or use an item
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
index 61bd7afdafc77725c24c6af978578df0b2d8ca0f..189a00cb68ce9a9060117b79c5356ebb93d7fa62 100644
|
index 4798eac1498ebeecf0476a61a093d3871c00d5a5..2b10ae84ee8e9f63382d732e8c051fc47f0c5d9f 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||||||
@@ -212,7 +212,7 @@ public abstract class EntityLiving extends Entity {
|
@@ -212,7 +212,7 @@ public abstract class EntityLiving extends Entity {
|
@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index 36c9ee703660d0ef558481ef0fea0984502bc14e..945ea6022d89bfb6ee4429233909f8294141fbb6 100644
|
index 1fce5548544f00fd79839a23e05ec5690f6f0621..a2b3f5106edc8328ba7edd65dedd56e0dc8d33d2 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -1304,6 +1304,15 @@ public class CraftWorld implements World {
|
@@ -1304,6 +1304,15 @@ public class CraftWorld implements World {
|
@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
|
|||||||
We should kind of know about these things you know.
|
We should kind of know about these things you know.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
index c7e54920b40bdf049f2192310bfdb9d1749580d0..9af581339884d99709242735ad655d90faf7224a 100644
|
index eb19b6fc87bfd4e500ea7836c1010a80b36abab2..d6a4ec132cadf8134a21f625f4ca978d37c643d0 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
@@ -1077,7 +1077,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
@@ -1077,7 +1077,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
@ -5,10 +5,10 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 3ebdf97dd88e9461331434da4a8cd02bd25148ca..325dc0a46666d5e0cd050fd1fb793c08866c2a43 100644
|
index 6b2eac7aac7e9a343472cc033b34cbe3e3a82e32..dd5f7dba3610b63aa16088a94bf3b459d496cb3c 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -93,6 +93,13 @@
|
@@ -88,6 +88,13 @@
|
||||||
<artifactId>log4j-iostreams</artifactId>
|
<artifactId>log4j-iostreams</artifactId>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
|
|||||||
UUID, ticks lived, valid, dead
|
UUID, ticks lived, valid, dead
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||||
index 6b6de18e368d48b61482a7210794b756d805a460..a4915d330d9df8773ce2643a17f353045fff7965 100644
|
index 828f238e8f3b1a98310532e07c72161582c91c5b..bd9cd050c72792c3d5a2094991b21e3a998b2cd9 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||||
@@ -2522,7 +2522,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
@@ -2522,7 +2522,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
@ -18,7 +18,7 @@ an invalid entity.
|
|||||||
This should reduce log occurrences of dupe uuid messages.
|
This should reduce log occurrences of dupe uuid messages.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
index 14321bc6ecc5ca70e71c1eef9578091822aa94cd..ce7431ea8597c645bb2c97f596796dbf12206e72 100644
|
index 650015f08ef4defe7510ff2f5cbd25364b733515..e39f1ea4eefb0d8e0ca379b116b3699c13bb3f35 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
@@ -1157,6 +1157,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
@@ -1157,6 +1157,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
@ -23,7 +23,7 @@ index 6943524c2dd8b12691b8ac5b08daee823ce50c3d..b67bd98cca4a06bc0ebaed577195dffc
|
|||||||
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
|
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
|
||||||
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ);
|
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ);
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
index ce7431ea8597c645bb2c97f596796dbf12206e72..4eda8d2065d72c67b1e1cf9e9560e13e7f24d470 100644
|
index e39f1ea4eefb0d8e0ca379b116b3699c13bb3f35..9151d84e2f6fb316525c74466589178769fbc8ef 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
||||||
@@ -1309,6 +1309,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
@@ -1309,6 +1309,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
||||||
@ -83,7 +83,7 @@ index e4accac8f2e8daa58f9b0c279ffcad9347448bb0..79ff96f18c53f3d1ce4a00be2e2d8fe6
|
|||||||
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
|
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
|
||||||
list.add(t0);
|
list.add(t0);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index 945ea6022d89bfb6ee4429233909f8294141fbb6..716974f9f455a8b35a2bee0ef17e795676f44105 100644
|
index a2b3f5106edc8328ba7edd65dedd56e0dc8d33d2..e7103b8021141071712759b1056eccb5e3da93b7 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -1040,6 +1040,7 @@ public class CraftWorld implements World {
|
@@ -1040,6 +1040,7 @@ public class CraftWorld implements World {
|
@ -82,7 +82,7 @@ index b6b55d5baa5e8a6b69a3e4865c06bc8a4d61a4f3..152118729b1a95dcae05d32aa4289034
|
|||||||
this.g.add(nbttagcompound);
|
this.g.add(nbttagcompound);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||||
index c525afbc7d73488db2cae1501cdbe80ec05aeb7c..ce5d8463763dd39e1225d9dec0514b1754df5411 100644
|
index 2ac8b6ac38bdca26cddfb8652f13b0be0c4000fe..24db5dedf8b41b26fa990a7c7317cdb3e89e7fcd 100644
|
||||||
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||||
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||||
@@ -114,7 +114,7 @@ public final class ItemStack {
|
@@ -114,7 +114,7 @@ public final class ItemStack {
|
@ -48,7 +48,7 @@ index 925dd2dc2b4af5596c9dc891f756bad66baadbea..540250a9610e2ee51685b655a7d6c080
|
|||||||
long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
|
long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
|
||||||
lastTick = start - TICK_TIME; // Paper
|
lastTick = start - TICK_TIME; // Paper
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 6b0b55aa2ac4dec4e6005f557b9ba6975a7b58ed..d2e8d50adc49cc00d95f928a65a3c23fff0c4c80 100644
|
index d15314af5ed58c846b97997fdfdf28786873ae01..72e2c6f731c1d2cb0eafedef7317b35a45b55dd7 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -813,6 +813,7 @@ public final class CraftServer implements Server {
|
@@ -813,6 +813,7 @@ public final class CraftServer implements Server {
|
@ -122,7 +122,7 @@ index 52256f72b00d3b868ef1a60e15a3836197c769d9..cd35b833d3047a38be980ee550641e87
|
|||||||
|
|
||||||
this.d.values().stream().map((jsonlistentry) -> {
|
this.d.values().stream().map((jsonlistentry) -> {
|
||||||
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||||
index 349bd74e7e4d1dea9587e55cb6afc1968628ca01..3aaa6313a33865b9823aa38e5d0cce7edce04592 100644
|
index 80934fc662b33b1c88dd7a3033792d612a7c7930..2299581fa889c0e8ddc6b2cc1d3551d02ff8dc2d 100644
|
||||||
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||||
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||||
@@ -618,7 +618,7 @@ public abstract class PlayerList {
|
@@ -618,7 +618,7 @@ public abstract class PlayerList {
|
Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden Mehr anzeigen
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren