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

Patch rebuild

Browse source
This commit is contained in:
md_5 2017-01-20 10:15:52 +11:00
parent 0b1090d04c
commit b32c8f871b
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CraftBukkit-Patches/0010-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 32f9541530153b6f71a50e17004c80393d266682 Mon Sep 17 00:00:00 2001 From 0af02266d96f3e3e8942c3cfef724f7cde344e0d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500 Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings Subject: [PATCH] Spigot Timings
@ -124,7 +124,7 @@ index 9d2d7af..0a28b09 100644
public boolean aa() { public boolean aa() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index dc4695f..1d13ab2 100644 index c3d15d4..c6bfcd4 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -25,6 +25,7 @@ import org.bukkit.block.BlockFace; @@ -25,6 +25,7 @@ import org.bukkit.block.BlockFace;
@ -355,7 +355,7 @@ index 1553c0e..1d5f7dc 100644
this.methodProfiler.b(); this.methodProfiler.b();
} }
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d498880..12d013f 100644 index f66dfc9..2d4ebed 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1269,6 +1269,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -1269,6 +1269,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -407,7 +407,7 @@ index 8a0194e..f1284c7 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials(); private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world; protected World world;
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 19470bc..ae0ec3b 100644 index 2cb3715..ef8caa8 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
@@ -18,6 +18,7 @@ import com.google.common.collect.Maps; @@ -18,6 +18,7 @@ import com.google.common.collect.Maps;
@ -467,7 +467,7 @@ index 19470bc..ae0ec3b 100644
@@ -1404,6 +1413,7 @@ public abstract class World implements IBlockAccess { @@ -1404,6 +1413,7 @@ public abstract class World implements IBlockAccess {
if (this.isLoaded(blockposition) && this.N.a(blockposition)) { if (this.isLoaded(blockposition) && this.N.a(blockposition)) {
try { try {
this.methodProfiler.a(""/*tileentity.getClass().getSimpleName()*/); // CraftBukkit: SPIGOT-1900 this.methodProfiler.a("ticking"/*tileentity.getClass().getSimpleName()*/); // CraftBukkit: SPIGOT-1900
+ tileentity.tickTimer.startTiming(); // Spigot + tileentity.tickTimer.startTiming(); // Spigot
((ITickable) tileentity).F_(); ((ITickable) tileentity).F_();
this.methodProfiler.b(); this.methodProfiler.b();
@ -518,10 +518,10 @@ index 19470bc..ae0ec3b 100644
} }
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 ba066ca..ace069c 100644 index 4efe636..0990ddb 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
@@ -224,10 +224,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -225,10 +225,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
// CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals // CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals
long time = this.worldData.getTime(); long time = this.worldData.getTime();
if (this.getGameRules().getBoolean("doMobSpawning") && this.worldData.getType() != WorldType.DEBUG_ALL_BLOCK_STATES && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) { if (this.getGameRules().getBoolean("doMobSpawning") && this.worldData.getType() != WorldType.DEBUG_ALL_BLOCK_STATES && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) {
@ -535,7 +535,7 @@ index ba066ca..ace069c 100644
this.methodProfiler.c("chunkSource"); this.methodProfiler.c("chunkSource");
this.chunkProvider.unloadChunks(); this.chunkProvider.unloadChunks();
int j = this.a(1.0F); int j = this.a(1.0F);
@@ -241,21 +244,36 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -242,21 +245,36 @@ public class WorldServer extends World implements IAsyncTaskHandler {
this.worldData.setDayTime(this.worldData.getDayTime() + 1L); this.worldData.setDayTime(this.worldData.getDayTime() + 1L);
} }

6
CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
View file

@ -1,4 +1,4 @@
From dc5523e11348e6902b98f13919a081aef29bff54 Mon Sep 17 00:00:00 2001 From af3a534ebe3fd3086e2edbae1ea7e56630c6b2b9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000 Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -18,10 +18,10 @@ index ee898dd..fab61ea 100644
} }
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 ed5ee83..2d8b5e2 100644 index 0990ddb..06c2733 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
@@ -383,7 +383,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -384,7 +384,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
protected void i() { protected void i() {
this.methodProfiler.a("playerCheckLight"); this.methodProfiler.a("playerCheckLight");

6
CraftBukkit-Patches/0128-Limit-TNT-Detonations-per-tick.patch
View file

@ -1,4 +1,4 @@
From 57395f2eda1712904c340c75dee8543dc9567c23 Mon Sep 17 00:00:00 2001 From 7929220be62fccbeaecc70611938fdc98e819b60 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400 Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick Subject: [PATCH] Limit TNT Detonations per tick
@ -19,10 +19,10 @@ index 8f0c54c..0fbdbd6 100644
this.lastY = this.locY; this.lastY = this.locY;
this.lastZ = this.locZ; this.lastZ = this.locZ;
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 76c19d7..e17fc63 100644 index e960453..8893842 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
@@ -614,6 +614,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -615,6 +615,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
this.worldProvider.s(); this.worldProvider.s();
super.tickEntities(); super.tickEntities();

6
CraftBukkit-Patches/0141-Don-t-tick-blocks-if-neighbor-chunks-aren-t-loaded.patch
View file

@ -1,14 +1,14 @@
From c95aee689a7ee40156e08d3955ff12e3f77e106a Mon Sep 17 00:00:00 2001 From c301c9aa79c5d2bca0f483cec7dfc8aee186ddb8 Mon Sep 17 00:00:00 2001
From: BlackHole <black-hole@live.com> From: BlackHole <black-hole@live.com>
Date: Fri, 22 Apr 2016 16:43:47 +0200 Date: Fri, 22 Apr 2016 16:43:47 +0200
Subject: [PATCH] Don't tick blocks if neighbor chunks aren't loaded Subject: [PATCH] Don't tick blocks if neighbor chunks aren't loaded
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 5455610..695bb42 100644 index 8893842..391a09c 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
@@ -422,6 +422,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -423,6 +423,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
chunk.n(); chunk.n();
this.methodProfiler.c("tickChunk"); this.methodProfiler.c("tickChunk");
chunk.b(false); chunk.b(false);