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

Upstream merge

Browse source
This commit is contained in:
Thinkofdeath 2015-01-04 23:32:22 +00:00
parent 59b08be583
commit a723278f74
14 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,14 +1,14 @@
From dd80360067eb138d8633edcb2392d118d509b242 Mon Sep 17 00:00:00 2001
From 0a5c11f342f2957ea2952a4094d7c010a546ece6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:49:36 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9fa886f..dc1e5da 100644
index de7815f..7fb08af 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -341,4 +341,22 @@ public interface Entity extends Metadatable {
@@ -342,4 +342,22 @@ public interface Entity extends Metadatable, CommandSender {
* @return if the custom name is displayed
*/
public boolean isCustomNameVisible();

10
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 6543ea640160f625e68be67db807d32ff47b7d27 Mon Sep 17 00:00:00 2001
From a5daa61c44f4f1a4ca80e50e6e772fd6ec6c9149 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -64,12 +64,12 @@ index dca8520..bf48e6e 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index b7e9d8f..4b26bb0 100644
index dee0d4e..9d1e3c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -436,4 +436,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean isCustomNameVisible() {
return getHandle().getCustomNameVisible();
@@ -535,4 +535,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public void setOp(boolean value) {
perm.setOp(value);
}
+
+ // Spigot start

14
CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
View file

@ -1,4 +1,4 @@
From 09f7b5fa62a19b90ee09b80fec983922cfd01388 Mon Sep 17 00:00:00 2001
From 7495c1e3084f2499ff0b84d267ccaab8e603deb4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection
@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection
An optimized chunk ticking algorithm which better selects chunks around players which are active on the server.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b15988a..db05ee3 100644
index 3c1ba5b..6d8a5e8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -64,7 +64,7 @@ public abstract class World implements IBlockAccess {
@ -62,7 +62,7 @@ index b15988a..db05ee3 100644
this.K = this.random.nextInt(12000);
this.allowMonsters = true;
@@ -1905,17 +1935,44 @@ public abstract class World implements IBlockAccess {
@@ -1892,17 +1922,44 @@ public abstract class World implements IBlockAccess {
int k;
int l;
@ -111,10 +111,10 @@ index b15988a..db05ee3 100644
this.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6ab9354..786a367 100644
index 80c464a..b81b1ff 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -344,12 +344,15 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -343,12 +343,15 @@ public class WorldServer extends World implements IAsyncTaskHandler {
protected void h() {
super.h();
if (this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) {
@ -133,7 +133,7 @@ index 6ab9354..786a367 100644
}
} else {
@@ -361,9 +364,21 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -360,9 +363,21 @@ public class WorldServer extends World implements IAsyncTaskHandler {
// ChunkCoordIntPair chunkcoordintpair1 = (ChunkCoordIntPair) iterator1.next();
// int k = chunkcoordintpair1.x * 16;
// int l = chunkcoordintpair1.z * 16;
@ -158,7 +158,7 @@ index 6ab9354..786a367 100644
int k = chunkX * 16;
int l = chunkZ * 16;
@@ -458,6 +473,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -457,6 +472,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
}
}

6
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 2ae2ea254cbba63669fa3227bb1c638ed100e6ed Mon Sep 17 00:00:00 2001
From 0142d5b90cccc709bbb014d243ca84380ee8bb6b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -66,7 +66,7 @@ index 1204c56..640d7ff 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.d(this.tracker);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 57aba85..3982d53 100644
index 30b5fed..86be044 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -893,6 +893,7 @@ public abstract class World implements IBlockAccess {
@ -85,7 +85,7 @@ index 57aba85..3982d53 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2431,6 +2433,7 @@ public abstract class World implements IBlockAccess {
@@ -2418,6 +2420,7 @@ public abstract class World implements IBlockAccess {
}
public void b(Collection collection) {

6
CraftBukkit-Patches/0011-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 1134e06c56f1adcb857f827faede78912080d794 Mon Sep 17 00:00:00 2001
From 86d5f2c6cb1066f6ae83fffff61c0f3927b47103 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance
@ -22,10 +22,10 @@ index 8ac9387..5ca5935 100644
public WorldServer a() {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 786a367..737b546 100644
index b81b1ff..8a09a79 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -62,7 +62,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -60,7 +60,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
// CraftBukkit end
this.server = minecraftserver;
this.tracker = new EntityTracker(this);

14
CraftBukkit-Patches/0012-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 9c1350d6fd67ca5822326b458b156d13167269e2 Mon Sep 17 00:00:00 2001
From 150230a661eebb715f886672039148424e36d4b6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -133,7 +133,7 @@ index 424b71d..390c6eb 100644
public boolean ad() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 317eaf3..3577d1f 100644
index 976ab95..05213eb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -16,6 +16,7 @@ import org.bukkit.entity.Hanging;
@ -367,7 +367,7 @@ index 5e53661..49429d7 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ba20917..7863f9b 100644
index 6d3e88b..fad01f3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1042,6 +1042,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -420,7 +420,7 @@ index ec76148..a93ad27 100644
private static Map f = Maps.newHashMap();
private static Map g = Maps.newHashMap();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3982d53..ca9984b 100644
index 86be044..06bd661 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,6 +18,7 @@ import org.bukkit.Bukkit;
@ -530,10 +530,10 @@ index 3982d53..ca9984b 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 737b546..c07f9f8 100644
index 8a09a79..1d6be5f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -212,10 +212,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -210,10 +210,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
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)) {
@ -548,7 +548,7 @@ index 737b546..c07f9f8 100644
this.methodProfiler.c("chunkSource");
this.chunkProvider.unloadChunks();
int j = this.a(1.0F);
@@ -229,21 +232,34 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -227,21 +230,34 @@ public class WorldServer extends World implements IAsyncTaskHandler {
this.worldData.setDayTime(this.worldData.getDayTime() + 1L);
}

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

@ -1,4 +1,4 @@
From c03487c3efd1843fe1e6f73a6a82c3753f3a7753 Mon Sep 17 00:00:00 2001
From c29a5303addd4314733282e7d62c30b8afa6a960 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -18,10 +18,10 @@ index 9e65ff7..2e715b3 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5ce3f41..16198c9 100644
index d85479b..dad3d19 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2030,7 +2030,7 @@ public abstract class World implements IBlockAccess {
@@ -2017,7 +2017,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");

6
CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,14 +1,14 @@
From eb1e769979d543a0ed9869a6574ae1376205eb81 Mon Sep 17 00:00:00 2001
From 9d8c03f562bec54eabbc059207d8df92d284b2ea Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sat, 3 Aug 2013 19:53:48 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 4b26bb0..c50396d 100644
index 9d1e3c3..a009343 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -440,6 +440,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -539,6 +539,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Spigot start
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch
View file

@ -1,14 +1,14 @@
From df5918e5254041f8e89667704637f8e81189c0d4 Mon Sep 17 00:00:00 2001
From ace9986dd28ae6d5c95bf7b492a9fb14ba5276bc Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 14:07:41 +1100
Subject: [PATCH] Warn if PermGen may be insufficient
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 9ffd897..f039fbf 100644
index 4e642b7..c5bc388 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -158,6 +158,22 @@ public class Main {
@@ -165,6 +165,22 @@ public class Main {
useConsole = false;
}

6
CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch
View file

@ -1,14 +1,14 @@
From 16097da89d401d5fa4c15c2801761e8b143aa2e4 Mon Sep 17 00:00:00 2001
From 91b06e4a88a74680f6568e7ec0a1d1f591fa65e2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c164922..5a78872 100644
index 4a7c92e..9cfbead 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1680,7 +1680,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -1682,7 +1682,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
// CraftBukkit - Add invalidItems check

6
CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch
View file

@ -1,4 +1,4 @@
From 9c9d62f76a376fabac32c4c11009727385f24afd Mon Sep 17 00:00:00 2001
From 6a44270f052392f647d527139895ceb7df47ece8 Mon Sep 17 00:00:00 2001
From: hcherndon <hcherndon@gmail.com>
Date: Sat, 15 Feb 2014 01:51:20 -0600
Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5a78872..6078aec 100644
index 9cfbead..2e1b08e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2037,7 +2037,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -2039,7 +2039,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
}
// CraftBukkit start - Add "isDisconnected" method

6
CraftBukkit-Patches/0125-Cross-World-Entity-Teleportation.patch
View file

@ -1,4 +1,4 @@
From 7b13a593684de51c52c719cfefd52a836f9540fe Mon Sep 17 00:00:00 2001
From 47f772a8953a7e579da580cbae661e461b0306a8 Mon Sep 17 00:00:00 2001
From: Andrew Krieger <Slizyboy@hotmail.com>
Date: Tue, 24 Dec 2013 07:55:23 -0800
Subject: [PATCH] Cross World Entity Teleportation
@ -6,10 +6,10 @@ Subject: [PATCH] Cross World Entity Teleportation
Use Entity.teleportTo for cross-world teleportation in CraftEntity.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index c50396d..7e87fed 100644
index a009343..16d7900 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -212,7 +212,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -231,7 +231,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// If this entity is riding another entity, we must dismount before teleporting.
entity.mount(null);

6
CraftBukkit-Patches/0147-Fix-Corrupted-Trapped-Chest.patch
View file

@ -1,4 +1,4 @@
From 9ea93ce470b8cea2f46afc8eb92b91742672bcf9 Mon Sep 17 00:00:00 2001
From 693f7eab0c90276e580495726c1e4cdebb773eef Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 15 Aug 2014 00:56:41 -0400
Subject: [PATCH] Fix Corrupted Trapped Chest
@ -9,10 +9,10 @@ If a Trapped Chest gets its Tile Entity corrupted, it will crash the server ever
This will now fix Trapped Chests too.
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c07f9f8..6dc3acf 100644
index 1d6be5f..439bb00 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -114,7 +114,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -112,7 +112,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
TileEntity result = super.getTileEntity(pos);
Block type = getType(pos).getBlock();

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

@ -1,4 +1,4 @@
From d83f0c646ae80e2714c16363ffcf8991fcaf2ec7 Mon Sep 17 00:00:00 2001
From f914e1af5a441b8e10b095f62314395914605a0c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick
@ -19,10 +19,10 @@ index 98c8d26..3621faf 100644
this.lastY = this.locY;
this.lastZ = this.locZ;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6dc3acf..3bba0ca 100644
index 439bb00..a61655f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -575,6 +575,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -574,6 +574,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
}
super.tickEntities();