mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
Zach Brown 2015-03-09 16:02:50 -05:00
parent b994904d84
commit ad93cd940f
8 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0002-PaperSpigot-config-files.patch
View file

@ -1,4 +1,4 @@
From bc080a4a08b6df777ec3b59a04af73905bf5180f Mon Sep 17 00:00:00 2001 From 88e448b2b100242b023b6ce42553515333007cc5 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 12 Jul 2014 19:32:01 -0500 Date: Sat, 12 Jul 2014 19:32:01 -0500
Subject: [PATCH] PaperSpigot config files Subject: [PATCH] PaperSpigot config files
@ -20,7 +20,7 @@ index 86ff385..b80ffe5 100644
DedicatedServer.LOGGER.info("Generating keypair"); DedicatedServer.LOGGER.info("Generating keypair");
this.a(MinecraftEncryption.b()); this.a(MinecraftEncryption.b());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 34d3697..31df781 100644 index 3c89c0d..eb1efce 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -158,6 +158,8 @@ public abstract class World implements IBlockAccess { @@ -158,6 +158,8 @@ public abstract class World implements IBlockAccess {
@ -39,7 +39,7 @@ index 34d3697..31df781 100644
+ this.paperSpigotConfig = new org.github.paperspigot.PaperSpigotWorldConfig( worlddata.getName() ); // PaperSpigot + this.paperSpigotConfig = new org.github.paperspigot.PaperSpigotWorldConfig( worlddata.getName() ); // PaperSpigot
this.generator = gen; this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env); this.world = new CraftWorld((WorldServer) this, gen, env);
if (gen != null) { this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
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 6174417..b5bf0ec 100644 index 6174417..b5bf0ec 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

6
Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch
View file

@ -1,4 +1,4 @@
From 85b439d4648ae4766f5c54754219b5fd0ea315ac Mon Sep 17 00:00:00 2001 From 8ae819d36ca20264aec0d137ea473e856b5ca8e3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 7 Mar 2015 19:50:01 -0600 Date: Sat, 7 Mar 2015 19:50:01 -0600
Subject: [PATCH] Vanished players don't have rights Subject: [PATCH] Vanished players don't have rights
@ -56,10 +56,10 @@ index 451a0bb..24601c7 100644
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); 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 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 31df781..4838e84 100644 index eb1efce..79f3a35 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1671,6 +1671,13 @@ public abstract class World implements IBlockAccess { @@ -1668,6 +1668,13 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < list.size(); ++i) { for (int i = 0; i < list.size(); ++i) {
Entity entity1 = (Entity) list.get(i); Entity entity1 = (Entity) list.get(i);

8
Spigot-Server-Patches/0011-Fix-redstone-lag-issues.patch
View file

@ -1,14 +1,14 @@
From 4be2389b6d3bd729c67031f327b9aaa8612d3838 Mon Sep 17 00:00:00 2001 From 906384a591c53969ada81e81facac32fe5678b44 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv> From: Iceee <andrew@opticgaming.tv>
Date: Sat, 7 Mar 2015 20:49:31 -0600 Date: Sat, 7 Mar 2015 20:49:31 -0600
Subject: [PATCH] Fix redstone lag issues Subject: [PATCH] Fix redstone lag issues
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 22e4b10..29dcd9e 100644 index 1090707..fce4e46 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -598,6 +598,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -604,6 +604,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
if (i != this.L.size()) { if (i != this.L.size()) {
throw new IllegalStateException("TickNextTick list out of synch"); throw new IllegalStateException("TickNextTick list out of synch");
} else { } else {
@ -17,7 +17,7 @@ index 22e4b10..29dcd9e 100644
if (i > 1000) { if (i > 1000) {
// CraftBukkit start - If the server has too much to process over time, try to alleviate that // CraftBukkit start - If the server has too much to process over time, try to alleviate that
if (i > 20 * 1000) { if (i > 20 * 1000) {
@@ -606,7 +608,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -612,7 +614,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
i = 1000; i = 1000;
} }
// CraftBukkit end // CraftBukkit end

6
Spigot-Server-Patches/0018-Allow-for-toggling-of-spawn-chunks.patch
View file

@ -1,14 +1,14 @@
From 2b22e3d08ec2571481e97963d548e3c7a0c854d7 Mon Sep 17 00:00:00 2001 From fe58a8833b9879118f5995e1c7b096927d95b4ac Mon Sep 17 00:00:00 2001
From: Dmck2b <itallhappenedverysuddenly@gmail.com> From: Dmck2b <itallhappenedverysuddenly@gmail.com>
Date: Sat, 7 Mar 2015 21:50:40 -0600 Date: Sat, 7 Mar 2015 21:50:40 -0600
Subject: [PATCH] Allow for toggling of spawn chunks Subject: [PATCH] Allow for toggling of spawn chunks
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4838e84..3523abf 100644 index 79f3a35..5de359f 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -230,6 +230,7 @@ public abstract class World implements IBlockAccess { @@ -227,6 +227,7 @@ public abstract class World implements IBlockAccess {
}); });
this.getServer().addWorld(this.world); this.getServer().addWorld(this.world);
// CraftBukkit end // CraftBukkit end

6
Spigot-Server-Patches/0021-Player-affects-spawning-API.patch
View file

@ -1,4 +1,4 @@
From 531e69345a9a1546a0a517891ba5cf0df3ecd9c5 Mon Sep 17 00:00:00 2001 From 454e8437a7c5f9488bbf5eb9da051d93e437815c Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 7 Mar 2015 22:52:21 -0600 Date: Sat, 7 Mar 2015 22:52:21 -0600
Subject: [PATCH] Player affects spawning API Subject: [PATCH] Player affects spawning API
@ -65,10 +65,10 @@ index aeb0a44..7df5b84 100644
biomebase_biomemeta = worldserver.a(enumcreaturetype, blockposition2); biomebase_biomemeta = worldserver.a(enumcreaturetype, blockposition2);
if (biomebase_biomemeta == null) { if (biomebase_biomemeta == null) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3523abf..d8464b2 100644 index 5de359f..d409544 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -3119,4 +3119,50 @@ public abstract class World implements IBlockAccess { @@ -3116,4 +3116,50 @@ public abstract class World implements IBlockAccess {
return k >= -short0 && k <= short0 && l >= -short0 && l <= short0 && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory' return k >= -short0 && k <= short0 && l >= -short0 && l <= short0 && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory'
} }

12
Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch
View file

@ -1,4 +1,4 @@
From aa360f67f1544600d0efc94ae896e6e328abd1de Mon Sep 17 00:00:00 2001 From 1426b1cb32376ab29d1e094b8cd0ee4235ded98a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 01:56:22 -0600 Date: Sun, 8 Mar 2015 01:56:22 -0600
Subject: [PATCH] Optimize TileEntity Ticking Subject: [PATCH] Optimize TileEntity Ticking
@ -74,7 +74,7 @@ index f75e2de..7119612 100644
if (this.e instanceof BlockDaylightDetector) { if (this.e instanceof BlockDaylightDetector) {
((BlockDaylightDetector) this.e).f(this.world, this.position); ((BlockDaylightDetector) this.e).f(this.world, this.position);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d8464b2..6fb32a2 100644 index d409544..1edf395 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -62,7 +62,7 @@ public abstract class World implements IBlockAccess { @@ -62,7 +62,7 @@ public abstract class World implements IBlockAccess {
@ -99,7 +99,7 @@ index d8464b2..6fb32a2 100644
public static long chunkToKey(int x, int z) public static long chunkToKey(int x, int z)
{ {
@@ -233,7 +235,7 @@ public abstract class World implements IBlockAccess { @@ -230,7 +232,7 @@ public abstract class World implements IBlockAccess {
this.keepSpawnInMemory = this.paperSpigotConfig.keepSpawnInMemory; // PaperSpigot this.keepSpawnInMemory = this.paperSpigotConfig.keepSpawnInMemory; // PaperSpigot
timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
@ -108,7 +108,7 @@ index d8464b2..6fb32a2 100644
} }
public World b() { public World b() {
@@ -1467,6 +1469,12 @@ public abstract class World implements IBlockAccess { @@ -1464,6 +1466,12 @@ public abstract class World implements IBlockAccess {
} }
// CraftBukkit end // CraftBukkit end
@ -121,7 +121,7 @@ index d8464b2..6fb32a2 100644
// Spigot start // Spigot start
int tilesThisCycle = 0; int tilesThisCycle = 0;
for (tileLimiter.initTick(); for (tileLimiter.initTick();
@@ -1474,10 +1482,12 @@ public abstract class World implements IBlockAccess { @@ -1471,10 +1479,12 @@ public abstract class World implements IBlockAccess {
tileTickPosition++, tilesThisCycle++) { tileTickPosition++, tilesThisCycle++) {
tileTickPosition = (tileTickPosition < tileEntityList.size()) ? tileTickPosition : 0; tileTickPosition = (tileTickPosition < tileEntityList.size()) ? tileTickPosition : 0;
TileEntity tileentity = (TileEntity) this.tileEntityList.get(tileTickPosition); TileEntity tileentity = (TileEntity) this.tileEntityList.get(tileTickPosition);
@ -135,7 +135,7 @@ index d8464b2..6fb32a2 100644
continue; continue;
} }
// Spigot end // Spigot end
@@ -1505,7 +1515,7 @@ public abstract class World implements IBlockAccess { @@ -1502,7 +1512,7 @@ public abstract class World implements IBlockAccess {
} }
if (tileentity.x()) { if (tileentity.x()) {

8
Spigot-Server-Patches/0027-Remove-certain-entities-that-fly-through-unloaded-ch.patch
View file

@ -1,4 +1,4 @@
From 6442bb1cb89024243a3a5192ec4e93f4be114a81 Mon Sep 17 00:00:00 2001 From 0311567c78327f3310ceb0f645cf31037949c6da Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv> From: Iceee <andrew@opticgaming.tv>
Date: Sun, 8 Mar 2015 03:34:15 -0500 Date: Sun, 8 Mar 2015 03:34:15 -0500
Subject: [PATCH] Remove certain entities that fly through unloaded chunks Subject: [PATCH] Remove certain entities that fly through unloaded chunks
@ -70,10 +70,10 @@ index 2d22327..50423eb 100644
this.motY *= 0.9800000190734863D; this.motY *= 0.9800000190734863D;
this.motZ *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6fb32a2..698e3d9 100644 index 1edf395..aecc834 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1174,6 +1174,7 @@ public abstract class World implements IBlockAccess { @@ -1171,6 +1171,7 @@ public abstract class World implements IBlockAccess {
{ {
if ( !this.isChunkLoaded( chunkx, chunkz, true ) ) if ( !this.isChunkLoaded( chunkx, chunkz, true ) )
{ {
@ -81,7 +81,7 @@ index 6fb32a2..698e3d9 100644
continue; continue;
} }
int cz = chunkz << 4; int cz = chunkz << 4;
@@ -1603,6 +1604,14 @@ public abstract class World implements IBlockAccess { @@ -1600,6 +1601,14 @@ public abstract class World implements IBlockAccess {
if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
entity.ticksLived++; entity.ticksLived++;
entity.inactiveTick(); entity.inactiveTick();

8
Spigot-Server-Patches/0037-Prevent-tile-entity-and-entity-crashes.patch
View file

@ -1,4 +1,4 @@
From ff2332b83eb0f24d8d2168026a1e6c32643831e7 Mon Sep 17 00:00:00 2001 From d63b9fa7def1ca0607249795e4c3bd7ae77f440f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 04:37:23 -0500 Date: Sun, 8 Mar 2015 04:37:23 -0500
Subject: [PATCH] Prevent tile entity and entity crashes Subject: [PATCH] Prevent tile entity and entity crashes
@ -23,10 +23,10 @@ index 2118c08..bd8278a 100644
public String a() throws Exception { public String a() throws Exception {
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock()); 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 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 698e3d9..91998cc 100644 index aecc834..e32bd3b 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1432,10 +1432,13 @@ public abstract class World implements IBlockAccess { @@ -1429,10 +1429,13 @@ public abstract class World implements IBlockAccess {
this.g(entity); this.g(entity);
SpigotTimings.tickEntityTimer.stopTiming(); // Spigot SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
} catch (Throwable throwable1) { } catch (Throwable throwable1) {
@ -44,7 +44,7 @@ index 698e3d9..91998cc 100644
} }
} }
@@ -1501,11 +1504,13 @@ public abstract class World implements IBlockAccess { @@ -1498,11 +1501,13 @@ public abstract class World implements IBlockAccess {
tileentity.tickTimer.startTiming(); // Spigot tileentity.tickTimer.startTiming(); // Spigot
((IUpdatePlayerListBox) tileentity).c(); ((IUpdatePlayerListBox) tileentity).c();
} catch (Throwable throwable2) { } catch (Throwable throwable2) {