Upstream merge
This commit is contained in:
parent
95e4d28a35
commit
ae34175e3d
|
@ -1 +1 @@
|
|||
Subproject commit 578627622c3c374d6e123f7aa8acc6df9fbd23c9
|
||||
Subproject commit 4d832c39f320f7745a210a9d9a0accc665bd49dd
|
|
@ -1,4 +1,4 @@
|
|||
From 7ee37a400f775d11d94b1382912ea39316871ff5 Mon Sep 17 00:00:00 2001
|
||||
From a49d646e20683324316f385e6fd2d3614f425a48 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 3 Feb 2013 05:10:21 -0500
|
||||
Subject: [PATCH] Entity Activation Range
|
||||
|
@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
|
|||
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index d817369..0b6e9cf 100644
|
||||
index 0999562..e966314 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -91,7 +91,7 @@ public abstract class Entity {
|
||||
|
@ -137,12 +137,12 @@ index a228a2c..0a81006 100644
|
|||
super(world);
|
||||
this.a(0.25F, 0.25F);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index f90e2a3..6c77253 100644
|
||||
index b3bf43a..a180c89 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -78,6 +78,13 @@ public abstract class EntityLiving extends Entity {
|
||||
public int expToDrop;
|
||||
@@ -80,6 +80,13 @@ public abstract class EntityLiving extends Entity {
|
||||
public int maxAirTicks = 300;
|
||||
ArrayList<org.bukkit.inventory.ItemStack> drops = null;
|
||||
// CraftBukkit end
|
||||
+ // Spigot start
|
||||
+ public void inactiveTick()
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 05af846b96eabf3961284ab159e1f1dcd88ae1da Mon Sep 17 00:00:00 2001
|
||||
From 9bc96791db6467b0721810dba820374aa6c46065 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Mon, 4 Mar 2013 18:45:52 +1100
|
||||
Subject: [PATCH] PlayerItemDamageEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
index bae352b..52ff8e6 100644
|
||||
index 7342848..5138eec 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
@@ -259,7 +259,13 @@ public final class ItemStack {
|
||||
@@ -270,7 +270,13 @@ public final class ItemStack {
|
||||
return this.item.getMaxDurability();
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ index bae352b..52ff8e6 100644
|
|||
if (!this.g()) {
|
||||
return false;
|
||||
} else {
|
||||
@@ -274,7 +280,16 @@ public final class ItemStack {
|
||||
@@ -285,7 +291,16 @@ public final class ItemStack {
|
||||
}
|
||||
|
||||
i -= k;
|
||||
|
@ -40,7 +40,7 @@ index bae352b..52ff8e6 100644
|
|||
return false;
|
||||
}
|
||||
}
|
||||
@@ -287,7 +302,7 @@ public final class ItemStack {
|
||||
@@ -298,7 +313,7 @@ public final class ItemStack {
|
||||
public void damage(int i, EntityLiving entityliving) {
|
||||
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
|
||||
if (this.g()) {
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From c5b92b3fdedecb5f1d46470d621f15e38c49608e Mon Sep 17 00:00:00 2001
|
||||
From c0e0deda0bfc821c7e234f387f9b28d079c692a8 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Tue, 2 Jul 2013 20:32:49 +1000
|
||||
Subject: [PATCH] Entity Mount and Dismount Events
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 9179baa..327daae 100644
|
||||
index e74e6d6..2a192e1 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1454,6 +1454,7 @@ public abstract class Entity {
|
||||
@@ -1461,6 +1461,7 @@ public abstract class Entity {
|
||||
}
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
@ -16,7 +16,7 @@ index 9179baa..327daae 100644
|
|||
|
||||
this.setPositionRotation(this.vehicle.locX, this.vehicle.boundingBox.b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
|
||||
this.vehicle.passenger = null;
|
||||
@@ -1489,6 +1490,17 @@ public abstract class Entity {
|
||||
@@ -1496,6 +1497,17 @@ public abstract class Entity {
|
||||
}
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 7b8655419021c68c1b8801b3a7ed96216c38e776 Mon Sep 17 00:00:00 2001
|
||||
From 6713b663f35b540ee53fd16621309304ea933189 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 3 Aug 2013 19:27:07 +1000
|
||||
Subject: [PATCH] Player Collision API
|
||||
|
@ -18,10 +18,10 @@ index 1fc7a22..d091bcf 100644
|
|||
Entity entity = (Entity) list.get(i);
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 403489e..dad8964 100644
|
||||
index a180c89..dbe58b1 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -1494,7 +1494,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1495,7 +1495,7 @@ public abstract class EntityLiving extends Entity {
|
||||
protected void bn() {
|
||||
List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
||||
|
||||
|
@ -57,7 +57,7 @@ index 3a0d679..367472d 100644
|
|||
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
|
||||
super(worldserver, gameprofile);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index fd1c137..059438d 100644
|
||||
index 4d2374d..a5002d8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1290,6 +1290,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From a50f4baccd5284833cff597dad3bdaa0f3ee471d Mon Sep 17 00:00:00 2001
|
||||
From ceb76cbb4b35e120e201acf9b304176fa2d3a74f Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Sun, 2 Feb 2014 16:55:46 +0000
|
||||
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 998fd36..c4bdccf 100644
|
||||
index 409b0ad..73d3b89 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -120,6 +120,7 @@ public abstract class Entity {
|
||||
|
@ -17,10 +17,10 @@ index 998fd36..c4bdccf 100644
|
|||
// Spigot end
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 11450ac..e146143 100644
|
||||
index 12e1036..76fe528 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -425,6 +425,12 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
@@ -400,6 +400,12 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
this.world.methodProfiler.a("checkDespawn");
|
||||
this.w();
|
||||
this.world.methodProfiler.b();
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 111a7bac3315b2f8a751faf88a471a41684aa833 Mon Sep 17 00:00:00 2001
|
||||
From de4027c312d39d2ab4824c5de2c0f43a79ce091d Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Fri, 10 Jan 2014 15:15:50 +1100
|
||||
Subject: [PATCH] Fix ItemStack Unbreakable Code
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
index 52ff8e6..a0050ba 100644
|
||||
index 5138eec..3a18002 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
@@ -213,7 +213,13 @@ public final class ItemStack {
|
||||
@@ -224,7 +224,13 @@ public final class ItemStack {
|
||||
}
|
||||
|
||||
public boolean g() {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From d5d17c04b5a9c0f672c267ab36b7dc15eb1dcd2d Mon Sep 17 00:00:00 2001
|
||||
From 36860f6c094b72ec31c6a712ffcb00da1ef46451 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 31 Jan 2014 11:18:34 -0500
|
||||
Subject: [PATCH] Cap Entity Collisions
|
||||
|
@ -7,7 +7,7 @@ Limit a single entity to colliding a max of configurable times per tick.
|
|||
This will alleviate issues where living entities are hoarded in 1x1 pens.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index c4bdccf..c542460 100644
|
||||
index 73d3b89..7f80895 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1023,6 +1023,7 @@ public abstract class Entity {
|
||||
|
@ -19,10 +19,10 @@ index c4bdccf..c542460 100644
|
|||
if (entity.passenger != this && entity.vehicle != this) {
|
||||
double d0 = entity.locX - this.locX;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index dad8964..234d7db 100644
|
||||
index dbe58b1..c821e78 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -1495,7 +1495,9 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1496,7 +1496,9 @@ public abstract class EntityLiving extends Entity {
|
||||
List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
||||
|
||||
if (this.R() && list != null && !list.isEmpty()) { // Spigot: Add this.R() condition
|
||||
|
@ -32,7 +32,7 @@ index dad8964..234d7db 100644
|
|||
Entity entity = (Entity) list.get(i);
|
||||
|
||||
// TODO better check now?
|
||||
@@ -1506,9 +1508,12 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1507,9 +1509,12 @@ public abstract class EntityLiving extends Entity {
|
||||
// CraftBukkit end
|
||||
|
||||
if (entity.R()) {
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From ecd3b9da7c4b9813bfe22dbbca61acbb5a17c83f Mon Sep 17 00:00:00 2001
|
||||
From 2edcc188acc78287943dc579ce423f2e546ce559 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 16 Apr 2014 01:40:30 -0400
|
||||
Subject: [PATCH] Convert Horses owner to UUID
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
index 7d67210..6104597 100644
|
||||
index 544c008..f2a1cb3 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
@@ -1001,6 +1001,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
|
||||
@@ -1014,6 +1014,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
|
||||
if (nbttagcompound.hasKeyOfType("OwnerUUID", 8)) {
|
||||
this.setOwnerUUID(nbttagcompound.getString("OwnerUUID"));
|
||||
}
|
||||
|
|
31
CraftBukkit-Patches/0148-Fix-Max-Stack-Size-Tracking.patch
Normal file
31
CraftBukkit-Patches/0148-Fix-Max-Stack-Size-Tracking.patch
Normal file
|
@ -0,0 +1,31 @@
|
|||
From d69b3ad28f5941dfdfa8a31213ffe41c0cd7bacd Mon Sep 17 00:00:00 2001
|
||||
From: prplz <tmtgr@hotmail.com>
|
||||
Date: Tue, 27 May 2014 17:39:41 +1000
|
||||
Subject: [PATCH] Fix Max Stack Size Tracking
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
|
||||
index 7358645..12e48d4 100644
|
||||
--- a/src/main/java/net/minecraft/server/Container.java
|
||||
+++ b/src/main/java/net/minecraft/server/Container.java
|
||||
@@ -504,7 +504,7 @@ public abstract class Container {
|
||||
itemstack.count -= maxStack - itemstack1.count;
|
||||
itemstack1.count = maxStack;
|
||||
slot.f();
|
||||
- flag1 = itemstack.count == 0; // Don't give a success return if we have leftovers
|
||||
+ flag1 = true; // Don't give a success return if we have leftovers
|
||||
}
|
||||
// CraftBukkit end
|
||||
}
|
||||
@@ -532,7 +532,7 @@ public abstract class Container {
|
||||
slot.f();
|
||||
// CraftBukkit start - Don't assume entire stack went in
|
||||
itemstack.count -= slot.getItem().count;
|
||||
- flag1 = itemstack.count == 0;
|
||||
+ flag1 = true;
|
||||
// CraftBukkit end
|
||||
break;
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
Loading…
Reference in a new issue