Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 12:30:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

Update to 1.12.2, May the Tacos be with you

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Shane Freeder 2017-09-18 12:04:01 +01:00
Ursprung 836db0ec9c
Commit d934dcc1e3
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: A3F61EA5A085289C
35 geänderte Dateien mit 170 neuen und 170 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
Spigot-API-Patches/0001-POM-changes.patch
Datei anzeigen

@ -1,11 +1,11 @@
From bb482a4433501afba6f645feccbcb9462eda8fd0 Mon Sep 17 00:00:00 2001
From a1f6c3a5e3fff4f051aea6a29d0e0582e1451d9c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 31b8f93e..360d2f08 100644
index 98f2d67a..9934e9af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,39 +3,39 @@
@ -22,7 +22,7 @@ index 31b8f93e..360d2f08 100644
+
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.12.1-R0.1-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -112,7 +112,7 @@ index 31b8f93e..360d2f08 100644
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
- <version>1.16</version>
- <executions>
- <execution>
- <phase>process-classes</phase>

10
Spigot-Server-Patches/0001-POM-Changes.patch
Datei anzeigen

@ -1,11 +1,11 @@
From b9de0f8861bf3e9f78624a40dd7855b376707eb5 Mon Sep 17 00:00:00 2001
From b729acf6c391a7f26a4e093724d238d56e6fa812 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index cbd561aed..7f6f7fe84 100644
index f31825f52..6a0a02883 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -17,7 +17,7 @@ index cbd561aed..7f6f7fe84 100644
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper</artifactId>
<packaging>jar</packaging>
<version>1.12.1-R0.1-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>http://www.spigotmc.org</url>
+ <name>Paper</name>
@ -141,7 +141,7 @@ index cbd561aed..7f6f7fe84 100644
@@ -247,18 +239,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version>
<version>3.7.0</version>
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
@ -171,5 +171,5 @@ index 93046379d..674096cab 100644
if (stream != null) {
--
2.13.4
2.14.1

34
Spigot-Server-Patches/0006-Timings-v2.patch
Datei anzeigen

@ -1,4 +1,4 @@
From eab42136f14467e13cb47dc33446c680649ffd4c Mon Sep 17 00:00:00 2001
From 1f315eea033e36c30cfdf2050d23a4ab56040bfd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@ -490,7 +490,7 @@ index d268fec39..52f6242d7 100644
private void z() {
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 787b201fd..024ea5912 100644
index ac478fb27..69ded6aa4 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -204,7 +204,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -500,10 +500,10 @@ index 787b201fd..024ea5912 100644
- try {
+ try (co.aikar.timings.Timing timed = world.timings.chunkSaveData.startTiming()) {
chunk.setLastSaved(this.world.getTime());
this.chunkLoader.a(this.world, chunk, unloaded); // Spigot
this.chunkLoader.saveChunk(this.world, chunk, unloaded); // Spigot
} catch (IOException ioexception) {
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index a07e2c1fd..682b4230e 100644
index 50ec3adb8..a401dec60 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -423,7 +423,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -543,7 +543,7 @@ index a07e2c1fd..682b4230e 100644
// return chunk; // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 6f63a5a1d..3b8425915 100644
index e1cb96a88..8f2afcc32 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -24,7 +24,7 @@ import java.io.PrintStream;
@ -737,7 +737,7 @@ index 284d1204d..3aab54206 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index da9ad6037..5b5c143b0 100644
index c1a8816b4..8d08b536a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -48,8 +48,8 @@ import org.bukkit.Bukkit;
@ -984,7 +984,7 @@ index eeac34998..e4ed2e991 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index b679b1363..03bbac737 100644
index 9dc1e2681..c291e2605 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -995,7 +995,7 @@ index b679b1363..03bbac737 100644
// CraftBukkit end
public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1367,7 +1368,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1373,7 +1374,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit end
private void handleCommand(String s) {
@ -1004,7 +1004,7 @@ index b679b1363..03bbac737 100644
// CraftBukkit start - whole method
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
@@ -1378,22 +1379,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1384,22 +1385,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -1148,7 +1148,7 @@ index 5a5a588e7..d2d4ff6fb 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1096c6c66..f06b82ec5 100644
index dbfed7c62..57607f25c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -19,11 +19,11 @@ import com.google.common.collect.Maps;
@ -1220,7 +1220,7 @@ index 1096c6c66..f06b82ec5 100644
crashreport1 = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
entity.appendEntityCrashDetails(crashreportsystemdetails1);
@@ -1574,6 +1578,7 @@ public abstract class World implements IBlockAccess {
@@ -1564,6 +1568,7 @@ public abstract class World implements IBlockAccess {
}
timings.tileEntityPending.stopTiming(); // Spigot
@ -1228,7 +1228,7 @@ index 1096c6c66..f06b82ec5 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1632,7 +1637,6 @@ public abstract class World implements IBlockAccess {
@@ -1622,7 +1627,6 @@ public abstract class World implements IBlockAccess {
}
// CraftBukkit end
@ -1236,7 +1236,7 @@ index 1096c6c66..f06b82ec5 100644
entity.M = entity.locX;
entity.N = entity.locY;
entity.O = entity.locZ;
@@ -1640,6 +1644,7 @@ public abstract class World implements IBlockAccess {
@@ -1630,6 +1634,7 @@ public abstract class World implements IBlockAccess {
entity.lastPitch = entity.pitch;
if (flag && entity.aa) {
++entity.ticksLived;
@ -1244,7 +1244,7 @@ index 1096c6c66..f06b82ec5 100644
if (entity.isPassenger()) {
entity.aE();
} else {
@@ -1699,8 +1704,6 @@ public abstract class World implements IBlockAccess {
@@ -1689,8 +1694,6 @@ public abstract class World implements IBlockAccess {
}
}
}
@ -1254,10 +1254,10 @@ index 1096c6c66..f06b82ec5 100644
public boolean b(AxisAlignedBB axisalignedbb) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8afe1d3d3..00b093976 100644
index d4f25cbf2..e492913a2 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -304,13 +304,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -305,13 +305,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
timings.doChunkUnload.stopTiming(); // Spigot
this.methodProfiler.c("tickPending");
@ -1906,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644
}
}
--
2.14.1.windows.1
2.14.1

10
Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 243a1e2e39b916cb8156a94c1765f68bf4c14eb6 Mon Sep 17 00:00:00 2001
From 533744e8d4544784fccf02ee896403323e4790b6 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 50829d843..5080290cd 100644
index 9643181fe..fa431b8e2 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -57,10 +57,10 @@ index a599a043d..1c7c187c7 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5c44e0ed4..27f428efa 100644
index eb27d080c..a35f714eb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2739,7 +2739,7 @@ public abstract class World implements IBlockAccess {
@@ -2729,7 +2729,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@ -91,5 +91,5 @@ index d38900887..939233ef7 100644
// Spigot start
--
2.13.3.windows.1
2.14.1

8
Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
Datei anzeigen

@ -1,4 +1,4 @@
From cec6fa899d937784ae350110089c2bd61a4edf37 Mon Sep 17 00:00:00 2001
From ea97aaf4fc101088eba933640867fb7b23fe90f7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:52:34 -0600
Subject: [PATCH] Prevent tile entity and entity crashes
@ -23,7 +23,7 @@ index d2d4ff6fb..65297a761 100644
public String a() throws Exception {
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3298cbe6b..c25e65428 100644
index 957e0101e..f29e518c7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1451,10 +1451,12 @@ public abstract class World implements IBlockAccess {
@ -43,7 +43,7 @@ index 3298cbe6b..c25e65428 100644
}
}
@@ -1519,10 +1521,13 @@ public abstract class World implements IBlockAccess {
@@ -1517,10 +1519,13 @@ public abstract class World implements IBlockAccess {
((ITickable) tileentity).e();
this.methodProfiler.b();
} catch (Throwable throwable2) {
@ -62,5 +62,5 @@ index 3298cbe6b..c25e65428 100644
// Spigot start
finally {
--
2.13.3.windows.1
2.14.1

8
Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 3c5718edd8cc3b77c2644b9006e135a1944b9429 Mon Sep 17 00:00:00 2001
From a2edd27f9aa96f68765c103e578597576c53c6cd Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 23:34:44 -0600
Subject: [PATCH] Configurable container update tick rate
@ -19,7 +19,7 @@ index 1bb956515..e6aae7317 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 76588e4a2..59967e81e 100644
index 00d2798c2..4dedab257 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -41,9 +41,9 @@ index 76588e4a2..59967e81e 100644
+ containerUpdateDelay = world.paperConfig.containerUpdateTickRate;
+ }
+ // Paper end
if (!this.world.isClientSide && !this.activeContainer.a((EntityHuman) this)) {
if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
this.closeInventory();
this.activeContainer = this.defaultContainer;
--
2.13.0
2.14.1

8
Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 5076dee348aa990ba8c5e71af0127260b01dd697 Mon Sep 17 00:00:00 2001
From 2c2e25a2ebff5602a158022297d13a46cc9fdf9a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 23:45:17 -0600
Subject: [PATCH] Disable spigot tick limiters
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7aeb46d12..df8b330a5 100644
index 31730fe35..41a0f5a62 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1428,10 +1428,10 @@ public abstract class World implements IBlockAccess {
@ -23,7 +23,7 @@ index 7aeb46d12..df8b330a5 100644
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end
@@ -1497,9 +1497,7 @@ public abstract class World implements IBlockAccess {
@@ -1495,9 +1495,7 @@ public abstract class World implements IBlockAccess {
// Spigot start
// Iterator iterator = this.tileEntityListTick.iterator();
int tilesThisCycle = 0;
@ -35,5 +35,5 @@ index 7aeb46d12..df8b330a5 100644
TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
// Spigot start
--
2.13.3.windows.1
2.14.1

8
Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 8ec664bfcb1379e06548827ca31d835b940b868b Mon Sep 17 00:00:00 2001
From bf5295b5f9c835c10c679c60f87df9eb14436ca4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:17:12 -0600
Subject: [PATCH] Ensure commands are not ran async
@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
that it is happening so that plugin authors can fix their code to stop executing commands async.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 03bbac737..4f784742c 100644
index c291e2605..5ebd3c78f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1300,6 +1300,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1306,6 +1306,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
if (!async && s.startsWith("/")) {
@ -82,5 +82,5 @@ index 80e175e59..7762cb432 100644
return true;
}
--
2.14.1.windows.1
2.14.1

10
Spigot-Server-Patches/0056-Ensure-inv-drag-is-in-bounds.patch
Datei anzeigen

@ -1,22 +1,22 @@
From 3a9666f74e085cef316955a628fb5dbd7c63c214 Mon Sep 17 00:00:00 2001
From bf866311f4f6ce12ea4e26e99b36f15ac43664ae Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:33:53 -0600
Subject: [PATCH] Ensure inv drag is in bounds
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
index 686250ea8..b826089d1 100644
index 7d80b68b2..3a488ce20 100644
--- a/src/main/java/net/minecraft/server/Container.java
+++ b/src/main/java/net/minecraft/server/Container.java
@@ -141,7 +141,7 @@ public abstract class Container {
this.d();
}
} else if (this.g == 1) {
- Slot slot = (Slot) this.c.get(i);
+ Slot slot = i < this.c.size() ? this.c.get(i) : null; // Paper - Ensure drag in bounds
- Slot slot = (Slot) this.slots.get(i);
+ Slot slot = i < this.slots.size() ? this.slots.get(i) : null; // Paper - Ensure drag in bounds
itemstack1 = playerinventory.getCarried();
if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
--
2.12.2.windows.2
2.14.1

12
Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 69de753bd05636242fc049021c34cb8622e85c69 Mon Sep 17 00:00:00 2001
From 3fb9c9e6dc87134f2723e78edaf12d4dddc907c7 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event
@ -89,7 +89,7 @@ index c8e52eab1..33737af78 100644
}
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index ae527d527..52490d02a 100644
index e9bc23a6f..4e51585a1 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -12,6 +12,7 @@ import java.util.Iterator;
@ -128,7 +128,7 @@ index ae527d527..52490d02a 100644
}
@@ -208,9 +217,14 @@ public class ChunkProviderServer implements IChunkProvider {
chunk.setLastSaved(this.world.getTime());
this.chunkLoader.a(this.world, chunk, unloaded); // Spigot
this.chunkLoader.saveChunk(this.world, chunk, unloaded); // Spigot
} catch (IOException ioexception) {
- ChunkProviderServer.a.error("Couldn\'t save chunk", ioexception);
+ // Paper start
@ -293,7 +293,7 @@ index 9ff4f23ab..6fce3015f 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1bb2a1a56..22497993c 100644
index 6d8010194..41e72aa01 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@
@ -316,7 +316,7 @@ index 1bb2a1a56..22497993c 100644
entity.dead = true;
continue;
// Paper end
@@ -1527,8 +1531,10 @@ public abstract class World implements IBlockAccess {
@@ -1525,8 +1529,10 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
} catch (Throwable throwable2) {
// Paper start - Prevent tile entity and entity crashes
@ -373,5 +373,5 @@ index 19adb77b5..b9d93a01f 100644
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
--
2.13.4
2.14.1

8
Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
Datei anzeigen

@ -1,14 +1,14 @@
From f41e730aab7129fd783861b1a6d57c838b9f58e4 Mon Sep 17 00:00:00 2001
From 22fe86a87519c97ee5197d6badf3fef8c868e0e2 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4f784742c..a6436a8e0 100644
index 5ebd3c78f..7a721ffc6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1061,7 +1061,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.x());
@ -71,5 +71,5 @@ index 7e95ec70f..d5c53032a 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.13.3.windows.1
2.14.1

12
Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
Datei anzeigen

@ -1,4 +1,4 @@
From cee3de8032c55ffbda6f413afdd1266931ce2122 Mon Sep 17 00:00:00 2001
From d9aa3ae519bd7235a528ce850414ddf33bf4b1d6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -99,7 +99,7 @@ index 3d784d0dc..afdc4a779 100644
private NibbleArray skyLight;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 557660163..8f4c7e95e 100644
index 9086a606f..e93c45cfc 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -277,12 +277,12 @@ public abstract class World implements IBlockAccess {
@ -228,7 +228,7 @@ index 557660163..8f4c7e95e 100644
public boolean D() {
return this.L < 4;
@@ -2029,7 +2038,7 @@ public abstract class World implements IBlockAccess {
@@ -2019,7 +2028,7 @@ public abstract class World implements IBlockAccess {
public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
@Nullable
public TileEntity getTileEntity(BlockPosition blockposition) {
@ -237,7 +237,7 @@ index 557660163..8f4c7e95e 100644
return null;
} else {
// CraftBukkit start
@@ -2070,7 +2079,7 @@ public abstract class World implements IBlockAccess {
@@ -2060,7 +2069,7 @@ public abstract class World implements IBlockAccess {
}
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@ -246,7 +246,7 @@ index 557660163..8f4c7e95e 100644
if (tileentity != null && !tileentity.y()) {
// CraftBukkit start
if (captureBlockStates) {
@@ -2133,7 +2142,7 @@ public abstract class World implements IBlockAccess {
@@ -2123,7 +2132,7 @@ public abstract class World implements IBlockAccess {
}
public boolean d(BlockPosition blockposition, boolean flag) {
@ -256,5 +256,5 @@ index 557660163..8f4c7e95e 100644
} else {
Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
--
2.13.3.windows.1
2.14.1

10
Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 58716693b71c7fe0eb53760254811832d8b6527a Mon Sep 17 00:00:00 2001
From 64683f371daad0082a825007f7f531cc5c55d029 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 19:55:45 -0400
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@ -25,7 +25,7 @@ index adc810720..e706efff5 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8f4c7e95e..6bb711d1f 100644
index e93c45cfc..f079d62e7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -582,7 +582,7 @@ public abstract class World implements IBlockAccess {
@ -38,10 +38,10 @@ index 8f4c7e95e..6bb711d1f 100644
this.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8e4697a00..3865b31cb 100644
index 72dc20087..f2ddc22dd 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -35,6 +35,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
public class WorldServer extends World implements IAsyncTaskHandler {
private static final Logger a = LogManager.getLogger();
@ -67,5 +67,5 @@ index 8e4697a00..3865b31cb 100644
timing.stopTiming(); // Paper
} else {
--
2.13.3.windows.1
2.14.1

8
Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
Datei anzeigen

@ -1,4 +1,4 @@
From cbf484f184ba45dc1ecf716a27fe16cf705707b2 Mon Sep 17 00:00:00 2001
From c2f58a2ac9c540c526780ff1af9fb6ae849276b3 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:09:16 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -18,10 +18,10 @@ index c67cb54a3..521f46262 100644
private Vec3D c;
private EnumHand d;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a6436a8e0..1eb8275b9 100644
index 7a721ffc6..4830dd581 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1646,6 +1646,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1652,6 +1652,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
}
}
@ -39,5 +39,5 @@ index a6436a8e0..1eb8275b9 100644
}
--
2.13.3.windows.1
2.14.1

10
Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 4786be5899e3b6dfaa445a411a3b4792cbe22253 Mon Sep 17 00:00:00 2001
From 7be59ddc090a6a8cf93f69dfbaa026997895c5a0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -21,7 +21,7 @@ index 74a49a5fb..3a942c763 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a5e3b13cc..57f508e42 100644
index 4e8ce79ff..2300ee10b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -357,8 +357,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -39,10 +39,10 @@ index a5e3b13cc..57f508e42 100644
if (i1 - j > 1000L) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7164f224f..f235f7483 100644
index f7987bb7b..641a1d7dd 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3212,8 +3212,9 @@ public abstract class World implements IBlockAccess {
@@ -3202,8 +3202,9 @@ public abstract class World implements IBlockAccess {
int k = i * 16 + 8 - blockposition.getX();
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;
@ -83,5 +83,5 @@ index 843a3415f..24b4a7ea7 100644
loadChunk(chunkCoordX + x, chunkCoordZ + z);
} else {
--
2.14.1.windows.1
2.14.1

8
Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 43f5fa426b70b792e3e7c4bb60487ac6ba9473da Mon Sep 17 00:00:00 2001
From 7afb68dd6652bc7684704811a4f00d94e3378599 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 19:42:22 -0400
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0ee112756..35f0b79d3 100644
index a968a5bb6..e4f509ce3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3208,6 +3208,7 @@ public abstract class World implements IBlockAccess {
@@ -3198,6 +3198,7 @@ public abstract class World implements IBlockAccess {
return this.P;
}
@ -29,5 +29,5 @@ index d0265f960..35d8d1a6e 100644
}
}
--
2.13.3.windows.1
2.14.1

10
Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
Datei anzeigen

@ -1,4 +1,4 @@
From cd1e07c1a8d63b99e61513857055f9f0c2c0190b Mon Sep 17 00:00:00 2001
From 8d5e21769c3bd1a416a1cb073dd63af77a317ac5 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 6 Apr 2016 01:04:23 -0500
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@ -19,7 +19,7 @@ index 3a942c763..3bd29650c 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 92605e32c..79e6ab41b 100644
index 7912d05d9..e04a7d942 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2073,6 +2073,7 @@ public abstract class Entity implements ICommandListener {
@ -31,10 +31,10 @@ index 92605e32c..79e6ab41b 100644
public ScoreboardTeamBase aY() {
if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1eb8275b9..e6c3f15ae 100644
index 4830dd581..506eab20d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1379,7 +1379,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1385,7 +1385,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
return;
}
@ -51,5 +51,5 @@ index 1eb8275b9..e6c3f15ae 100644
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
for (Object recipient : minecraftServer.getPlayerList().players) {
--
2.13.3.windows.1
2.14.1

20
Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 6ef7899b07cdbd17adab2f3e43d5a359ebf9ac38 Mon Sep 17 00:00:00 2001
From 557026b0f5055642ce2cfc003e1e14671e17755f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 00:25:28 -0400
Subject: [PATCH] Remove unused World Tile Entity List
@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
Massive hit to performance and it is completely unnecessary.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 35f0b79d3..6d452a968 100644
index e4f509ce3..506946049 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -69,7 +69,7 @@ public abstract class World implements IBlockAccess {
@ -18,16 +18,16 @@ index 35f0b79d3..6d452a968 100644
public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
private final List<TileEntity> b = Lists.newArrayList();
private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
@@ -1574,7 +1574,7 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - From below, clean up tile entities before ticking them
@@ -1572,7 +1572,7 @@ public abstract class World implements IBlockAccess {
timings.tileEntityTick.startTiming(); // Spigot
if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
- this.tileEntityList.removeAll(this.tileEntityListUnload);
+ //this.tileEntityList.removeAll(this.tileEntityListUnload); // Paper - remove unused list
this.tileEntityListUnload.clear();
}
// CraftBukkit end
@@ -1627,7 +1627,7 @@ public abstract class World implements IBlockAccess {
@@ -1625,7 +1625,7 @@ public abstract class World implements IBlockAccess {
if (tileentity.y()) {
tilesThisCycle--;
this.tileEntityListTick.remove(tileTickPosition--);
@ -36,7 +36,7 @@ index 35f0b79d3..6d452a968 100644
if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
}
@@ -1665,7 +1665,7 @@ public abstract class World implements IBlockAccess {
@@ -1655,7 +1655,7 @@ public abstract class World implements IBlockAccess {
this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
// CraftBukkit start
// From above, don't screw this up - SPIGOT-1746
@ -45,7 +45,7 @@ index 35f0b79d3..6d452a968 100644
this.a(tileentity1);
}
// CraftBukkit end
@@ -1685,9 +1685,9 @@ public abstract class World implements IBlockAccess {
@@ -1675,9 +1675,9 @@ public abstract class World implements IBlockAccess {
protected void l() {}
public boolean a(TileEntity tileentity) {
@ -57,7 +57,7 @@ index 35f0b79d3..6d452a968 100644
this.tileEntityListTick.add(tileentity);
}
@@ -2126,7 +2126,7 @@ public abstract class World implements IBlockAccess {
@@ -2116,7 +2116,7 @@ public abstract class World implements IBlockAccess {
} else {
if (tileentity != null) {
this.b.remove(tileentity);
@ -67,5 +67,5 @@ index 35f0b79d3..6d452a968 100644
}
--
2.13.3.windows.1
2.14.1

10
Spigot-Server-Patches/0134-Avoid-blocking-on-Network-Manager-creation.patch
Datei anzeigen

@ -1,4 +1,4 @@
From e2a08b3a94447cee6d73854e8f38eb3a6c9e8c1d Mon Sep 17 00:00:00 2001
From f01c96105b693ab0badfd8a57529919bfb0ed6f0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 23:19:16 -0400
Subject: [PATCH] Avoid blocking on Network Manager creation
@ -6,13 +6,13 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
Per Paper issue 294
diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
index 43421649..447d54d9 100644
index 567edb300..4a629aaa1 100644
--- a/src/main/java/net/minecraft/server/ServerConnection.java
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
@@ -60,6 +60,15 @@ public class ServerConnection {
public volatile boolean d;
private final List<ChannelFuture> g = Collections.synchronizedList(Lists.<ChannelFuture>newArrayList());
private final List<NetworkManager> h = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
private final List<ChannelFuture> g = Collections.synchronizedList(Lists.newArrayList());
private final List<NetworkManager> h = Collections.synchronizedList(Lists.newArrayList());
+ // Paper start - prevent blocking on adding a new network manager while the server is ticking
+ private final List<NetworkManager> pending = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
+ private void addPending() {
@ -43,5 +43,5 @@ index 43421649..447d54d9 100644
if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
{
--
2.13.1.windows.2
2.14.1

8
Spigot-Server-Patches/0147-More-informative-vehicle-moved-wrongly-message.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 794376064968d36f41999ab9d720285d4ffdc74e Mon Sep 17 00:00:00 2001
From 6be1bbe127eda2d0bb7510d1e3d36aa55f9b50ac Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 Jul 2016 17:58:53 -0500
Subject: [PATCH] More informative vehicle moved wrongly message
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e6c3f15ae..3dc034976 100644
index 506eab20d..d6c9bfc5d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -351,7 +351,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -357,7 +357,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
flag1 = true;
@ -18,5 +18,5 @@ index e6c3f15ae..3dc034976 100644
entity.setLocation(d3, d4, d5, f, f1);
--
2.13.3.windows.1
2.14.1

8
Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
Datei anzeigen

@ -1,14 +1,14 @@
From bcbee74576d21dfc0526e833fb13d08d76c8775e Mon Sep 17 00:00:00 2001
From 357ea95e0730fc6d0e78bd65ffd06f1a2721c9e2 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Sun, 4 Sep 2016 16:35:43 -0500
Subject: [PATCH] Fix AIOOBE in inventory handling
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3dc034976..ad6854674 100644
index d6c9bfc5d..b8601ae87 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1838,7 +1838,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1844,7 +1844,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
case CLONE:
if (packetplayinwindowclick.c() == 2) {
click = ClickType.MIDDLE;
@ -18,5 +18,5 @@ index 3dc034976..ad6854674 100644
} else {
Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
--
2.13.3.windows.1
2.14.1

8
Spigot-Server-Patches/0153-Configurable-packet-in-spam-threshold.patch
Datei anzeigen

@ -1,4 +1,4 @@
From f54166832cee7a9973d72e2409cbcb3425682e00 Mon Sep 17 00:00:00 2001
From 6b1ddcf495ce0b8306cad6961f61af5ceb29dc16 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 11 Sep 2016 14:30:57 -0500
Subject: [PATCH] Configurable packet in spam threshold
@ -23,10 +23,10 @@ index cf06f8ac3..2001175bf 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ad6854674..076f1e608 100644
index b8601ae87..6edbe5cde 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -903,13 +903,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -909,13 +909,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// Spigot start - limit place/interactions
private int limitedPackets;
private long lastLimitedPacket = -1;
@ -44,5 +44,5 @@ index ad6854674..076f1e608 100644
limitedPackets = 0;
return true;
--
2.13.3.windows.1
2.14.1

8
Spigot-Server-Patches/0156-Chunk-registration-fixes.patch
Datei anzeigen

@ -1,4 +1,4 @@
From d1ddd4222e4d590a02494dc3277010767529cd65 Mon Sep 17 00:00:00 2001
From f526ddfc9009c6687cab1037386ba1b1af75686e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 21 Sep 2016 22:54:28 -0400
Subject: [PATCH] Chunk registration fixes
@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
Keep them consistent
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5672689cf..6b368216e 100644
index dfa98b6e1..a2b5926a1 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1776,7 +1776,7 @@ public abstract class World implements IBlockAccess {
@@ -1766,7 +1766,7 @@ public abstract class World implements IBlockAccess {
}
i = MathHelper.floor(entity.locX / 16.0D);
@ -21,5 +21,5 @@ index 5672689cf..6b368216e 100644
if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {
--
2.13.3.windows.1
2.14.1

12
Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 02fded4176f6ce406712e18df4075b70e1cbbfb2 Mon Sep 17 00:00:00 2001
From 0f2721ccf07d4698f377874093f70525616612ce Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 16 Dec 2016 22:10:35 -0600
Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7ff129181..13a307c43 100644
index a042c37c7..e0ae1f7dd 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@ -31,10 +31,10 @@ index 60149c1ca..a5730d1c7 100644
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index de11ef617..5bd721814 100644
index 445936c7b..843c944ab 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1811,6 +1811,33 @@ public abstract class World implements IBlockAccess {
@@ -1801,6 +1801,33 @@ public abstract class World implements IBlockAccess {
return this.a(axisalignedbb, (Entity) null);
}
@ -68,7 +68,7 @@ index de11ef617..5bd721814 100644
public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
List list = this.getEntities((Entity) null, axisalignedbb);
@@ -2701,7 +2728,7 @@ public abstract class World implements IBlockAccess {
@@ -2691,7 +2718,7 @@ public abstract class World implements IBlockAccess {
AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition);
// CraftBukkit start - store default return
@ -96,5 +96,5 @@ index 16f6410b2..883ef489f 100644
return event;
}
--
2.13.3.windows.1
2.14.1

16
Spigot-Server-Patches/0185-IllegalPacketEvent.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 983a585c4c499ae187c5f1dbb651c01a9efc42f8 Mon Sep 17 00:00:00 2001
From 94325356fde629d45e054726494f870b871a964a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 23 Jun 2016 23:33:57 -0400
Subject: [PATCH] IllegalPacketEvent
@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
Fired for invalid data from players that represents hacking attempts
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5855d2961..22bc68a05 100644
index dbd9d30b9..d963abc9a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -17,7 +17,7 @@ index 5855d2961..22bc68a05 100644
import co.aikar.timings.MinecraftTimings; // Paper
// CraftBukkit end
@@ -2272,8 +2273,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2281,8 +2282,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
}
} catch (Exception exception) {
@ -27,7 +27,7 @@ index 5855d2961..22bc68a05 100644
}
} else {
String s1;
@@ -2322,8 +2322,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2331,8 +2331,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
}
} catch (Exception exception1) {
@ -37,7 +37,7 @@ index 5855d2961..22bc68a05 100644
}
} else if ("MC|TrSel".equals(s)) {
try {
@@ -2334,8 +2333,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2343,8 +2342,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
((ContainerMerchant) container).d(j);
}
} catch (Exception exception2) {
@ -47,7 +47,7 @@ index 5855d2961..22bc68a05 100644
}
} else {
TileEntity tileentity;
@@ -2476,8 +2474,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2485,8 +2483,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
iinventory.update();
}
} catch (Exception exception5) {
@ -57,7 +57,7 @@ index 5855d2961..22bc68a05 100644
}
}
} else if ("MC|ItemName".equals(s)) {
@@ -2576,8 +2573,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2585,8 +2582,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k)));
this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
} catch (Exception exception7) {
@ -68,5 +68,5 @@ index 5855d2961..22bc68a05 100644
}
// CraftBukkit start
--
2.13.3.windows.1
2.14.1

10
Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 838a66b4f1a02548a55279d8a5b476db304ae07f Mon Sep 17 00:00:00 2001
From 6fe4f5078fe35089db4a9e52d729d387e4934225 Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Tue, 27 Dec 2016 01:57:57 +0000
Subject: [PATCH] Properly fix item duplication bug
@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
Credit to prplz for figuring out the real issue
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index c861a1a59..ecf0e839a 100644
index 53147c6e2..5fbb99b7e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1491,7 +1491,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -19,10 +19,10 @@ index c861a1a59..ecf0e839a 100644
@Override
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 22bc68a05..533cb281c 100644
index d963abc9a..dd6cbe947 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2616,6 +2616,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2625,6 +2625,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start - Add "isDisconnected" method
public final boolean isDisconnected() {
@ -31,5 +31,5 @@ index 22bc68a05..533cb281c 100644
}
}
--
2.13.3.windows.1
2.14.1

8
Spigot-Server-Patches/0196-Fix-block-break-desync.patch
Datei anzeigen

@ -1,14 +1,14 @@
From fd17bc0e39c6b819ae1046dceeb3640a7e54f42a Mon Sep 17 00:00:00 2001
From cdcb9a66070a968b4d11d041b52e8f61c98e4f55 Mon Sep 17 00:00:00 2001
From: Michael Himing <mhiming@gmail.com>
Date: Sun, 8 Jan 2017 18:50:35 +1100
Subject: [PATCH] Fix block break desync
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 533cb281c..14495d28c 100644
index dd6cbe947..65b69574e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -862,6 +862,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -868,6 +868,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
double d3 = d0 * d0 + d1 * d1 + d2 * d2;
if (d3 > 36.0D) {
@ -17,5 +17,5 @@ index 533cb281c..14495d28c 100644
} else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
return;
--
2.13.3.windows.1
2.14.1

10
Spigot-Server-Patches/0209-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 4f6bd3337826922ebf63413a79ad5f5cc894ced2 Mon Sep 17 00:00:00 2001
From 87361eb607a71e11f1ae423d1848b24cb2d1a29a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 16 May 2017 21:29:08 -0500
Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@ -26,7 +26,7 @@ index af953dda4..1ce3aaa8c 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 1c841a907..608f6550f 100644
index 3cc13bdc4..a8f5117bc 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -399,7 +399,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -39,10 +39,10 @@ index 1c841a907..608f6550f 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 14495d28c..53cf54d14 100644
index 65b69574e..5c8cd73ea 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1503,6 +1503,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1509,6 +1509,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
switch (packetplayinentityaction.b()) {
case START_SNEAKING:
this.player.setSneaking(true);
@ -57,5 +57,5 @@ index 14495d28c..53cf54d14 100644
case STOP_SNEAKING:
--
2.13.3.windows.1
2.14.1

12
Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ef09bda3406cb85a42a1e09d96f566998c0ebaf2 Mon Sep 17 00:00:00 2001
From a49974fc6a244b79944d3ce52a64d9c0da8d4c6c Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 9 Jun 2017 19:03:43 +0200
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -20,7 +20,7 @@ Other changes:
configuration
diff --git a/pom.xml b/pom.xml
index 69bcf936d..a62a698fd 100644
index 6a0a02883..3c20c8f34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,12 +53,6 @@
@ -184,7 +184,7 @@ index 000000000..d5bc61490
+
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 3b8425915..059f6b6b5 100644
index 8f2afcc32..b3f1aa999 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -237,7 +237,7 @@ index 3b8425915..059f6b6b5 100644
System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a4f44b39b..ea2c57137 100644
index 908a5d273..e8bddc171 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -42,7 +42,6 @@ import org.apache.commons.lang3.Validate;
@ -336,7 +336,7 @@ index 5c36e7373..cb4b78e0e 100644
@Override
public PluginCommand getPluginCommand(String name) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index d565a720f..c9e8a8737 100644
index ec9508e90..d3d848f8c 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -14,7 +14,7 @@ import java.util.logging.Logger;
@ -375,7 +375,7 @@ index d565a720f..c9e8a8737 100644
+ System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
}
if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
deleted file mode 100644
index 26a2fb894..000000000

8
Spigot-Server-Patches/0222-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
Datei anzeigen

@ -1,4 +1,4 @@
From e39cd406c65d339f164feb00677c6543f0d6c583 Mon Sep 17 00:00:00 2001
From 8b8ad3cdb51aaf4ba1ddaabbcc2042cb0a417857 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 22 Jul 2017 15:22:59 +0100
Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@ -6,10 +6,10 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index bde48b692..34a974617 100644
index 2ac5caaa4..c03be509f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -234,6 +234,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -235,6 +235,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
result = fixTileEntity(pos, type, result);
}
}
@ -24,5 +24,5 @@ index bde48b692..34a974617 100644
return result;
}
--
2.13.3
2.14.1

12
Spigot-Server-Patches/0233-Fix-MC-117075-TE-Unload-Lag-Spike.patch
Datei anzeigen

@ -1,11 +1,11 @@
From ed74bb4fedd0ddfc6385eb36ae705420be3b6c50 Mon Sep 17 00:00:00 2001
From cf26274e3d4eebb66781babe9364e228d1751371 Mon Sep 17 00:00:00 2001
From: mezz <tehgeek@gmail.com>
Date: Wed, 9 Aug 2017 17:51:22 -0500
Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
index 23944088..e8d1a1c6 100644
index 239440888..e8d1a1c60 100644
--- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
+++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
@@ -15,6 +15,7 @@ public class ChunkCoordIntPair {
@ -17,12 +17,12 @@ index 23944088..e8d1a1c6 100644
return (long) i & 4294967295L | ((long) j & 4294967295L) << 32;
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 12938b9f..4585f2ef 100644
index 30cf4a251..f690aaa10 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1576,7 +1576,11 @@ public abstract class World implements IBlockAccess {
@@ -1574,7 +1574,11 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.c("blockEntities");
timings.tileEntityTick.startTiming(); // Spigot
// CraftBukkit start - From below, clean up tile entities before ticking them
if (!this.tileEntityListUnload.isEmpty()) {
- this.tileEntityListTick.removeAll(this.tileEntityListUnload);
+ // Paper start - Use alternate implementation with faster contains
@ -34,5 +34,5 @@ index 12938b9f..4585f2ef 100644
this.tileEntityListUnload.clear();
}
--
2.14.1.windows.1
2.14.1

2
work/BuildData

@ -1 +1 @@
Subproject commit 206f6172a057dcb5243f17f99af6495f2af364cf
Subproject commit a9c4523879abc011821f06283dd468c67c3b0097

2
work/Bukkit

@ -1 +1 @@
Subproject commit 5d0b5b9c25730a2c77af6e3b12bb8fe0329fcdfa
Subproject commit 06355ab54732ff648a69bdb72aa242ff46e11e34

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 8f472147b7f78ccd565bc97a125030f92fdf732d
Subproject commit 9a1f5ee80a8665b0c388758003e2bda1ee924084

2
work/Spigot

@ -1 +1 @@
Subproject commit da4297479a847aaf2efa60ff147a44345c6bd737
Subproject commit 775423189fea374bf4f1d0391c4cf242e741185f