Patch rebuild.
This commit is contained in:
parent
81d41173b4
commit
b6be4076a3
7 changed files with 36 additions and 36 deletions
|
@ -1,4 +1,4 @@
|
|||
From e028f1d959724a25798c37587be731d57f9923dd Mon Sep 17 00:00:00 2001
|
||||
From 3015a566462335939f05cdcbfe7ac43610fc3432 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
|
||||
|
@ -26,10 +26,10 @@ index 12589d6..1d2f580 100644
|
|||
public int a(Random random) {
|
||||
return 1;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 0c5f269..170b192 100644
|
||||
index 3a0b94d..9b73738 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -618,6 +618,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -619,6 +619,7 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
|
||||
public void addEffect(MobEffect mobeffect) {
|
||||
|
@ -78,7 +78,7 @@ index 8b38bd2..f8570a8 100644
|
|||
this.trackedPlayers.remove(entityplayer);
|
||||
this.tracker.c(entityplayer);
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 1ee65dd..79b0c43 100644
|
||||
index 238f8f3..e0416a8 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -897,6 +897,7 @@ public abstract class World implements IBlockAccess {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 70aedd17a9daa7fc0b33b3d3f956726a8413419e Mon Sep 17 00:00:00 2001
|
||||
From c4eee49f085675aeac8c580d46204d985fd586b7 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
|
||||
|
@ -124,7 +124,7 @@ index 9c17951..db78855 100644
|
|||
|
||||
public boolean aa() {
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index bf6216c..7695d20 100644
|
||||
index e81a958..6e125e7 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -24,6 +24,7 @@ import org.bukkit.block.BlockFace;
|
||||
|
@ -160,7 +160,7 @@ index bf6216c..7695d20 100644
|
|||
|
||||
public void recalcPosition() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 170b192..5df8209 100644
|
||||
index 9b73738..dc1f1a7 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -23,6 +23,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
|
||||
|
@ -172,7 +172,7 @@ index 170b192..5df8209 100644
|
|||
public abstract class EntityLiving extends Entity {
|
||||
|
||||
private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
|
||||
@@ -1672,6 +1674,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1673,6 +1675,7 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
|
||||
public void m() {
|
||||
|
@ -180,7 +180,7 @@ index 170b192..5df8209 100644
|
|||
super.m();
|
||||
this.cu();
|
||||
if (!this.world.isClientSide) {
|
||||
@@ -1744,7 +1747,9 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1745,7 +1748,9 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -190,7 +190,7 @@ index 170b192..5df8209 100644
|
|||
double d0 = this.locX - this.lastX;
|
||||
double d1 = this.locZ - this.lastZ;
|
||||
float f = (float) (d0 * d0 + d1 * d1);
|
||||
@@ -1814,6 +1819,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1815,6 +1820,7 @@ public abstract class EntityLiving extends Entity {
|
||||
this.bo = 0;
|
||||
}
|
||||
|
||||
|
@ -198,7 +198,7 @@ index 170b192..5df8209 100644
|
|||
}
|
||||
|
||||
protected float h(float f, float f1) {
|
||||
@@ -1878,6 +1884,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1879,6 +1885,7 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
|
||||
this.world.methodProfiler.a("ai");
|
||||
|
@ -206,7 +206,7 @@ index 170b192..5df8209 100644
|
|||
if (this.cf()) {
|
||||
this.bc = false;
|
||||
this.bd = 0.0F;
|
||||
@@ -1888,6 +1895,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1889,6 +1896,7 @@ public abstract class EntityLiving extends Entity {
|
||||
this.doTick();
|
||||
this.world.methodProfiler.b();
|
||||
}
|
||||
|
@ -214,7 +214,7 @@ index 170b192..5df8209 100644
|
|||
|
||||
this.world.methodProfiler.b();
|
||||
this.world.methodProfiler.a("jump");
|
||||
@@ -1910,10 +1918,14 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1911,10 +1919,14 @@ public abstract class EntityLiving extends Entity {
|
||||
this.be *= 0.98F;
|
||||
this.bf *= 0.9F;
|
||||
this.r();
|
||||
|
@ -355,7 +355,7 @@ index c226e01..d754d0d 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 f813ad3..6985f31 100644
|
||||
index 821b75a..62c4877 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1274,6 +1274,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
|
@ -407,7 +407,7 @@ index baf1d73..8bbdc11 100644
|
|||
private static Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
|
||||
private static Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 79b0c43..7e8092f 100644
|
||||
index e0416a8..5b38491 100644
|
||||
--- a/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;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From d00c12d37558157deb7c3de4bb3931808bcac365 Mon Sep 17 00:00:00 2001
|
||||
From c02726daf6071087cb6812fae4cdd483f839bb74 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 7695d20..04dc2d1 100644
|
||||
index 6e125e7..87a069a 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -107,7 +107,7 @@ public abstract class Entity implements ICommandListener {
|
||||
|
@ -168,10 +168,10 @@ index eb0f8eb..39af5d5 100644
|
|||
// Spigot start
|
||||
double radius = world.spigotConfig.itemMerge;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 5df8209..e802a83 100644
|
||||
index dc1f1a7..a65ecb9 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -102,6 +102,13 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -103,6 +103,13 @@ public abstract class EntityLiving extends Entity {
|
||||
ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
|
||||
public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
|
||||
// CraftBukkit end
|
||||
|
@ -186,7 +186,7 @@ index 5df8209..e802a83 100644
|
|||
public void Q() {
|
||||
this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE);
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 59a7163..e09ddf7 100644
|
||||
index b828c9b..9bbf06e 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1336,6 +1336,7 @@ public abstract class World implements IBlockAccess {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From fbed5ed5753238e7be48c5960e0f5e104f3cb2d8 Mon Sep 17 00:00:00 2001
|
||||
From 702a638cb831bb4d5b650c9622d0eb83c5dc0db9 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
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index cd32f39..950a25a 100644
|
||||
index 00782c1..9042a4c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -376,6 +376,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
|
@ -25,10 +25,10 @@ index cd32f39..950a25a 100644
|
|||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index e802a83..12d858a 100644
|
||||
index a65ecb9..585ec6a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -1965,7 +1965,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1966,7 +1966,7 @@ public abstract class EntityLiving extends Entity {
|
||||
protected void cn() {
|
||||
List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this));
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ad6c13b9c1bb38bcff74e3e4742e4afd63c72fd6 Mon Sep 17 00:00:00 2001
|
||||
From 09871ed0272d617d98524cdc2f286f4dcca3146a 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 f1d7dc5..f6bec63 100644
|
||||
index a782867..c982151 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener {
|
||||
|
@ -19,10 +19,10 @@ index f1d7dc5..f6bec63 100644
|
|||
|
||||
public Entity(World world) {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 12d858a..8e8a29b 100644
|
||||
index 585ec6a..ec5b0cb 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -1966,7 +1966,8 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1967,7 +1967,8 @@ public abstract class EntityLiving extends Entity {
|
||||
List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this));
|
||||
|
||||
if (this.isInteractable() && !list.isEmpty()) { // Spigot: Add isInteractable() condition
|
||||
|
@ -32,7 +32,7 @@ index 12d858a..8e8a29b 100644
|
|||
Entity entity = (Entity) list.get(i);
|
||||
// TODO better check now?
|
||||
// CraftBukkit start - Only handle mob (non-player) collisions every other tick
|
||||
@@ -1975,7 +1976,8 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1976,7 +1977,8 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 75151f1551fd4bf5fbc99d84ce782a9f21758cd6 Mon Sep 17 00:00:00 2001
|
||||
From 833a65221a2d1c60819b0771834ba21e522f3875 Mon Sep 17 00:00:00 2001
|
||||
From: drXor <mcyoungsota@gmail.com>
|
||||
Date: Sat, 29 Mar 2014 13:44:25 -0400
|
||||
Subject: [PATCH] Configurable dragon death and wither spawn sounds
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
||||
index 0643672..cc548fc 100644
|
||||
index 737e463..b733df6 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
||||
@@ -497,7 +497,24 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
|
||||
@@ -552,7 +552,24 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
|
||||
}
|
||||
|
||||
if (this.bF == 1) {
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From d472c384eb888ed28249067169242d42a375382c Mon Sep 17 00:00:00 2001
|
||||
From 6736f5d4df51b5ac2086aa3261879a02f96ab78a Mon Sep 17 00:00:00 2001
|
||||
From: lazertester <austin.techhead@gmail.com>
|
||||
Date: Sun, 17 Aug 2014 19:56:17 +1000
|
||||
Subject: [PATCH] Add Hunger Config Values
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index 950a25a..1ad18f4 100644
|
||||
index 9042a4c..11fdee8 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -1140,7 +1140,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
@@ -1139,7 +1139,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -17,7 +17,7 @@ index 950a25a..1ad18f4 100644
|
|||
} else {
|
||||
this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dY, this.bz(), 1.0F, 1.0F);
|
||||
if (flag4) {
|
||||
@@ -1407,9 +1407,9 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
@@ -1406,9 +1406,9 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
super.ch();
|
||||
this.b(StatisticList.w);
|
||||
if (this.isSprinting()) {
|
||||
|
|
Loading…
Reference in a new issue