core/testserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update our patches for upstream changes

Browse source
This commit is contained in:
Zach Brown 2014-12-07 13:29:55 -06:00
parent 62b112be14
commit 6618287b5c
6 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch
View file

@ -1,14 +1,14 @@
From 55ffa201465306efe4167240fe27b0d1f960f2aa Mon Sep 17 00:00:00 2001 From c114520bb120e85f3c20fb412e49c606871133f6 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Fri, 28 Nov 2014 00:45:14 -0600 Date: Fri, 28 Nov 2014 00:45:14 -0600
Subject: [PATCH] Configurable damage multiplier for PvP blocking Subject: [PATCH] Configurable damage multiplier for PvP blocking
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 4ef5e01..b382854 100644 index 4ccd4d5..84ac6b2 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -860,7 +860,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -862,7 +862,7 @@ public abstract class EntityHuman extends EntityLiving {
// CraftBukkit end // CraftBukkit end
if (!this.isInvulnerable(damagesource)) { if (!this.isInvulnerable(damagesource)) {
if (!damagesource.ignoresArmor() && this.isBlocking() && f > 0.0F) { if (!damagesource.ignoresArmor() && this.isBlocking() && f > 0.0F) {

8
Spigot-Server-Patches/0013-Do-not-remove-player-in-world-change.patch
View file

@ -1,14 +1,14 @@
From e66b9b880bd800574dfc6bdf942ccef7af685313 Mon Sep 17 00:00:00 2001 From 1b65e810cf986d2288d9a0305bc1a4df1ab584b9 Mon Sep 17 00:00:00 2001
From: T00thpick1 <t00thpick1dirko@gmail.com> From: T00thpick1 <t00thpick1dirko@gmail.com>
Date: Fri, 28 Nov 2014 01:25:45 -0600 Date: Fri, 28 Nov 2014 01:25:45 -0600
Subject: [PATCH] Do not remove player in world change Subject: [PATCH] Do not remove player in world change
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 26e4328..04d9be9 100644 index 90030fb..d2f2547 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -440,7 +440,7 @@ public abstract class PlayerList { @@ -464,7 +464,7 @@ public abstract class PlayerList {
entityplayer.u().getTracker().untrackPlayer(entityplayer); entityplayer.u().getTracker().untrackPlayer(entityplayer);
// entityplayer.u().getTracker().untrackEntity(entityplayer); // CraftBukkit // entityplayer.u().getTracker().untrackEntity(entityplayer); // CraftBukkit
entityplayer.u().getPlayerChunkMap().removePlayer(entityplayer); entityplayer.u().getPlayerChunkMap().removePlayer(entityplayer);
@ -17,7 +17,7 @@ index 26e4328..04d9be9 100644
this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer); this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
BlockPosition blockposition = entityplayer.getBed(); BlockPosition blockposition = entityplayer.getBed();
boolean flag1 = entityplayer.isRespawnForced(); boolean flag1 = entityplayer.isRespawnForced();
@@ -534,7 +534,7 @@ public abstract class PlayerList { @@ -558,7 +558,7 @@ public abstract class PlayerList {
if (!entityplayer.playerConnection.isDisconnected()) { if (!entityplayer.playerConnection.isDisconnected()) {
worldserver.getPlayerChunkMap().addPlayer(entityplayer1); worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
worldserver.addEntity(entityplayer1); worldserver.addEntity(entityplayer1);

6
Spigot-Server-Patches/0017-Toggle-for-player-interact-limiter.patch
View file

@ -1,14 +1,14 @@
From fb8e42b3b2eab22ce99e5208c1b1ec379f3c0ffb Mon Sep 17 00:00:00 2001 From 338da46a277535bbc036295e4d5cca1061a1e4ef Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Fri, 28 Nov 2014 01:33:25 -0600 Date: Fri, 28 Nov 2014 01:33:25 -0600
Subject: [PATCH] Toggle for player interact limiter Subject: [PATCH] Toggle for player interact limiter
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 18b9e9b..789d838 100644 index 53f6de7..e8e3e5d 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
@@ -625,7 +625,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -626,7 +626,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u()); PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u());
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
boolean throttled = false; boolean throttled = false;

6
Spigot-Server-Patches/0018-Player-Exhaustion-Multipliers.patch
View file

@ -1,4 +1,4 @@
From 97c609c1e405273512d989e825cbc91a1157601a Mon Sep 17 00:00:00 2001 From 8305f28f6bc66b5a1fa4246a85d32e2998d2c865 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Fri, 28 Nov 2014 01:41:54 -0600 Date: Fri, 28 Nov 2014 01:41:54 -0600
Subject: [PATCH] Player Exhaustion Multipliers Subject: [PATCH] Player Exhaustion Multipliers
@ -18,10 +18,10 @@ index 9a19752..32d678d 100644
ItemStack itemstack = this.i(iblockdata); ItemStack itemstack = this.i(iblockdata);
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 20662f8..3e5e121 100644 index 84ac6b2..32199f1 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1352,13 +1352,13 @@ public abstract class EntityHuman extends EntityLiving { @@ -1371,13 +1371,13 @@ public abstract class EntityHuman extends EntityLiving {
i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F); i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F);
if (i > 0) { if (i > 0) {
this.a(StatisticList.p, i); this.a(StatisticList.p, i);

8
Spigot-Server-Patches/0024-Player-affects-spawning-API.patch
View file

@ -1,14 +1,14 @@
From 08432ad3b0e4017a60ee44bb35cca598bc41e60e Mon Sep 17 00:00:00 2001 From e79588a56cc3c99a0df366a06a2c351568650383 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 28 Nov 2014 03:31:21 -0600 Date: Fri, 28 Nov 2014 03:31:21 -0600
Subject: [PATCH] Player affects spawning API 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 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 3e5e121..76ec805 100644 index 32199f1..b760015 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -59,6 +59,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -61,6 +61,7 @@ public abstract class EntityHuman extends EntityLiving {
private final GameProfile bF; private final GameProfile bF;
private boolean bG = false; private boolean bG = false;
public EntityFishingHook hookedFish; public EntityFishingHook hookedFish;
@ -67,7 +67,7 @@ index 43954b3..932a572 100644
biomemeta = worldserver.a(enumcreaturetype, blockposition2); biomemeta = worldserver.a(enumcreaturetype, blockposition2);
if (biomemeta == null) { if (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 0b13b28..852415b 100644 index 095f81f..c57f2b7 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
@@ -2,14 +2,13 @@ package net.minecraft.server; @@ -2,14 +2,13 @@ package net.minecraft.server;

13
Spigot-Server-Patches/0036-Player-lookup-improvements.patch
View file

@ -1,4 +1,4 @@
From 21a71598b4b0c99c073324ae52bfed6141ddac3e Mon Sep 17 00:00:00 2001 From 3b0c7587dfe87b5fe35cb0208b8c12f590b1cee4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 13:43:11 -0600 Date: Fri, 28 Nov 2014 13:43:11 -0600
Subject: [PATCH] Player lookup improvements Subject: [PATCH] Player lookup improvements
@ -13,7 +13,7 @@ By using a map based approach for player lookups, player lookup should
be consistent in performance regardless of how many players are online. be consistent in performance regardless of how many players are online.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 90030fb..820eb69 100644 index d2f2547..d1daf3c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -48,6 +48,31 @@ public abstract class PlayerList { @@ -48,6 +48,31 @@ public abstract class PlayerList {
@ -91,7 +91,7 @@ index 90030fb..820eb69 100644
EntityPlayer entityplayer; EntityPlayer entityplayer;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
index 8be0698..2790bb7 100644 index 8be0698..4a908c6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -144,14 +144,10 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa @@ -144,14 +144,10 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@ -114,7 +114,7 @@ index 8be0698..2790bb7 100644
@Override @Override
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 68e3b26..4e21ab9 100644 index 590fe28..54e595d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -397,7 +397,12 @@ public final class CraftServer implements Server { @@ -397,7 +397,12 @@ public final class CraftServer implements Server {
@ -152,7 +152,7 @@ index 68e3b26..4e21ab9 100644
@Override @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d1f69dc..30eb6aa 100644 index b8a37b6..e495eb7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -103,13 +103,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -103,13 +103,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -171,4 +171,5 @@ index d1f69dc..30eb6aa 100644
public InetSocketAddress getAddress() { public InetSocketAddress getAddress() {
-- --
1.9.4.msysgit.2 1.9.1