mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-20 11:22:56 +02:00
Upstream merge
This commit is contained in:
parent
4342681445
commit
a118e4c40d
2
Bukkit
2
Bukkit
|
@ -1 +1 @@
|
|||
Subproject commit 8652e1ff2838e16b7a4e141a37c8bf45299b6edd
|
||||
Subproject commit f7163d78a692ee42099d133fb8ed2809e882532a
|
|
@ -1 +1 @@
|
|||
Subproject commit e027d69be8349978ffcc16d240d3141a981ea791
|
||||
Subproject commit 2b6a9ce3a9d3cce265ed7a6bf8c01c807a34f1a2
|
|
@ -1,14 +1,14 @@
|
|||
From 5e6467660d83b7174501637b4196fb749aead8cd Mon Sep 17 00:00:00 2001
|
||||
From d27a502bbf00ddc7a8a4ddd243de26f3499acd13 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
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index a4ede34..d9fbd00 100644
|
||||
index 4590a71..a97e330 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -1280,4 +1280,14 @@ public class CraftWorld implements World {
|
||||
@@ -1284,4 +1284,14 @@ public class CraftWorld implements World {
|
||||
cps.queueUnload(chunk.locX, chunk.locZ);
|
||||
}
|
||||
}
|
||||
|
@ -64,7 +64,7 @@ index fe0f200..e026c1f 100644
|
|||
+ // Spigot end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index b5a54c8..c1d3118 100644
|
||||
index 55ea121..dea26e0 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1285,4 +1285,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
@ -84,5 +84,5 @@ index b5a54c8..c1d3118 100644
|
|||
+ // Spigot end
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f7f33d6aa57afd53eb82d756077e993895658a15 Mon Sep 17 00:00:00 2001
|
||||
From 8f23df6817bcc4059768dab7547232f77f2616f1 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Fri, 21 Jun 2013 17:17:20 +1000
|
||||
Subject: [PATCH] Crop Growth Rates
|
||||
|
@ -39,26 +39,23 @@ index 57eb59d..6778cae 100644
|
|||
world.setData(i, j, k, 0, 4);
|
||||
this.doPhysics(world, i, j + 1, k, this);
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
|
||||
index 942d6ab..c46879c 100644
|
||||
index 875181f..fd28d85 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockCrops.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockCrops.java
|
||||
@@ -27,9 +27,8 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
|
||||
@@ -29,7 +29,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
|
||||
if (l < 7) {
|
||||
float f = this.n(world, i, j, k);
|
||||
|
||||
- if (random.nextInt((int) (25.0F / f) + 1) == 0) {
|
||||
- ++l;
|
||||
- org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this, l); // CraftBukkit
|
||||
+ if (random.nextInt((int) (world.growthOdds / world.spigotConfig.wheatModifier * (25.0F / f)) + 1) == 0) { // Spigot
|
||||
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this, ++l); // CraftBukkit
|
||||
++l;
|
||||
CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this, l); // CraftBukkit
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
|
||||
index bf14bbb..638ff49 100644
|
||||
index abd991b..7c00158 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockGrass.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockGrass.java
|
||||
@@ -38,7 +38,8 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement {
|
||||
@@ -39,7 +39,8 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement {
|
||||
}
|
||||
// CraftBukkit end
|
||||
} else if (world.getLightLevel(i, j + 1, k) >= 9) {
|
||||
|
@ -122,7 +119,7 @@ index 830eb65..24c95ef 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
|
||||
index 4fae805..a90fab1 100644
|
||||
index 40ad1c6..b37b187 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockStem.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockStem.java
|
||||
@@ -26,7 +26,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
|
||||
|
@ -175,5 +172,5 @@ index 90a227f..7e79ba5 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 4214005ab5b491ac0a9f6e2994cf1f5f89b01099 Mon Sep 17 00:00:00 2001
|
||||
From 4d0dee30d2d4d05d385ba1c8742948f79b5a3895 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 10 Jan 2013 00:18:11 -0500
|
||||
Subject: [PATCH] Improved Timings System
|
||||
|
@ -26,18 +26,18 @@ index 1b22934..b669d05 100644
|
|||
|
||||
return chunk;
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 9d933cb..491ef6b 100644
|
||||
index 1d0dee0..d817369 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
|
||||
@@ -15,6 +15,7 @@ import org.bukkit.entity.Hanging;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Painting;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
+import org.spigotmc.CustomTimingsHandler; // Spigot
|
||||
import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
||||
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
|
||||
import org.bukkit.event.painting.PaintingBreakByEntityEvent;
|
||||
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
|
||||
@@ -112,6 +113,8 @@ public abstract class Entity {
|
||||
@@ -114,6 +115,8 @@ public abstract class Entity {
|
||||
public boolean valid; // CraftBukkit
|
||||
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
|
||||
|
||||
|
@ -46,7 +46,7 @@ index 9d933cb..491ef6b 100644
|
|||
public int getId() {
|
||||
return this.id;
|
||||
}
|
||||
@@ -424,7 +427,8 @@ public abstract class Entity {
|
||||
@@ -426,7 +429,8 @@ public abstract class Entity {
|
||||
if (d0 == 0 && d1 == 0 && d2 == 0 && this.vehicle == null && this.passenger == null) {
|
||||
return;
|
||||
}
|
||||
|
@ -56,7 +56,7 @@ index 9d933cb..491ef6b 100644
|
|||
if (this.X) {
|
||||
this.boundingBox.d(d0, d1, d2);
|
||||
this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
|
||||
@@ -733,6 +737,7 @@ public abstract class Entity {
|
||||
@@ -735,6 +739,7 @@ public abstract class Entity {
|
||||
|
||||
this.world.methodProfiler.b();
|
||||
}
|
||||
|
@ -65,7 +65,7 @@ index 9d933cb..491ef6b 100644
|
|||
|
||||
protected String G() {
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index dda2602..d7b93a3 100644
|
||||
index 17b15f6..21cf068 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -37,6 +37,7 @@ import jline.console.ConsoleReader;
|
||||
|
@ -139,7 +139,7 @@ index dda2602..d7b93a3 100644
|
|||
|
||||
public boolean getAllowNether() {
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 946681d..f34fd03 100644
|
||||
index 9fa307e..ab9dc66 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -938,6 +938,7 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
|
@ -539,5 +539,5 @@ index 55db3ff..7d294c0 100644
|
|||
}
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ab979a085fe27c1d0b799b69288544965117daa3 Mon Sep 17 00:00:00 2001
|
||||
From c55d89f24822cee98493ecca99c8cf7c9a1b06f9 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,10 +9,10 @@ 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 491ef6b..4bcd57e 100644
|
||||
index d817369..0b6e9cf 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -89,7 +89,7 @@ public abstract class Entity {
|
||||
@@ -91,7 +91,7 @@ public abstract class Entity {
|
||||
public int ticksLived;
|
||||
public int maxFireTicks;
|
||||
public int fireTicks; // CraftBukkit - private -> public
|
||||
|
@ -21,7 +21,7 @@ index 491ef6b..4bcd57e 100644
|
|||
public int noDamageTicks;
|
||||
private boolean justCreated;
|
||||
protected boolean fireProof;
|
||||
@@ -113,7 +113,13 @@ public abstract class Entity {
|
||||
@@ -115,7 +115,13 @@ public abstract class Entity {
|
||||
public boolean valid; // CraftBukkit
|
||||
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
|
||||
|
||||
|
@ -35,7 +35,7 @@ index 491ef6b..4bcd57e 100644
|
|||
|
||||
public int getId() {
|
||||
return this.id;
|
||||
@@ -140,7 +146,12 @@ public abstract class Entity {
|
||||
@@ -142,7 +148,12 @@ public abstract class Entity {
|
||||
this.setPosition(0.0D, 0.0D, 0.0D);
|
||||
if (world != null) {
|
||||
this.dimension = world.worldProvider.dimension;
|
||||
|
@ -516,5 +516,5 @@ index 46249d7..ed2836a 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
1.8.5.2.msysgit.0
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 0c0bfe8b1127e609cdaf82697bf7ba4a87af5cd3 Mon Sep 17 00:00:00 2001
|
||||
From 5bc4b1498c02b4ad26a6ed80e46793426221011f Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 17 Mar 2013 19:02:50 +1100
|
||||
Subject: [PATCH] Faster UUID for entities
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Faster UUID for entities
|
|||
It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 4bcd57e..621f593 100644
|
||||
index 0b6e9cf..9179baa 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -140,7 +140,7 @@ public abstract class Entity {
|
||||
@@ -142,7 +142,7 @@ public abstract class Entity {
|
||||
this.random = new Random();
|
||||
this.maxFireTicks = 1;
|
||||
this.justCreated = true;
|
||||
|
@ -19,5 +19,5 @@ index 4bcd57e..621f593 100644
|
|||
this.world = world;
|
||||
this.setPosition(0.0D, 0.0D, 0.0D);
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 7057ec11fe46ec66b9d5f35b589a1c762e31a7f6 Mon Sep 17 00:00:00 2001
|
||||
From ae439b64018d26625c4698357ea2ea8a3bd81cc2 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 621f593..b13968d 100644
|
||||
index 9179baa..327daae 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1452,6 +1452,7 @@ public abstract class Entity {
|
||||
@@ -1454,6 +1454,7 @@ public abstract class Entity {
|
||||
}
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
@ -16,7 +16,7 @@ index 621f593..b13968d 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;
|
||||
@@ -1487,6 +1488,17 @@ public abstract class Entity {
|
||||
@@ -1489,6 +1490,17 @@ public abstract class Entity {
|
||||
}
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
@ -35,7 +35,7 @@ index 621f593..b13968d 100644
|
|||
if (this.vehicle != null) {
|
||||
this.vehicle.passenger = null;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index eb4793d..e2e7b9c 100644
|
||||
index 381ba31..1fc7a22 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -323,6 +323,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
|
||||
|
@ -47,5 +47,5 @@ index eb4793d..e2e7b9c 100644
|
|||
Entity originalVehicle = this.vehicle;
|
||||
// First statement moved down, second statement handled in parent method.
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ae732d661226c243c0f0c6562f87787def4d3a39 Mon Sep 17 00:00:00 2001
|
||||
From 3952f7c334513ce3a02d4d230327bd165dfdab49 Mon Sep 17 00:00:00 2001
|
||||
From: Dylan Xaldin <Puremin0rez515@gmail.com>
|
||||
Date: Thu, 12 Dec 2013 18:05:03 -0600
|
||||
Subject: [PATCH] Allow Disabling Zombie Villager Aggression
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Disabling Zombie Villager Aggression
|
|||
Ability to configure if Zombies will be aggressive towards Villagers.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
index a0b6f62..9098bfb 100644
|
||||
index ecb4abe..1eaac63 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
@@ -28,7 +28,7 @@ public class EntityZombie extends EntityMonster {
|
||||
@@ -30,7 +30,7 @@ public class EntityZombie extends EntityMonster {
|
||||
this.getNavigation().b(true);
|
||||
this.goalSelector.a(0, new PathfinderGoalFloat(this));
|
||||
this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, EntityHuman.class, 1.0D, false));
|
||||
|
@ -18,7 +18,7 @@ index a0b6f62..9098bfb 100644
|
|||
this.goalSelector.a(5, new PathfinderGoalMoveTowardsRestriction(this, 1.0D));
|
||||
this.goalSelector.a(6, new PathfinderGoalMoveThroughVillage(this, 1.0D, false));
|
||||
this.goalSelector.a(7, new PathfinderGoalRandomStroll(this, 1.0D));
|
||||
@@ -36,7 +36,7 @@ public class EntityZombie extends EntityMonster {
|
||||
@@ -38,7 +38,7 @@ public class EntityZombie extends EntityMonster {
|
||||
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
|
||||
this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, true));
|
||||
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget(this, EntityHuman.class, 0, true));
|
||||
|
@ -44,5 +44,5 @@ index 2c0501d..042280d 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 5c1e787e2e1b96758e403785b2cacbf5ccd05c6b Mon Sep 17 00:00:00 2001
|
||||
From 0952167f4e9323fbba6a59b610251bd01c9b0959 Mon Sep 17 00:00:00 2001
|
||||
From: Thinkofdeath <thethinkofdeath@gmail.com>
|
||||
Date: Fri, 20 Dec 2013 21:36:06 +0000
|
||||
Subject: [PATCH] Particle API
|
||||
|
@ -18,7 +18,7 @@ index 7de0de5..7eca388 100644
|
|||
datavalue = 0;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index bfa8c23..827ec16 100644
|
||||
index 1f26312..58c64fd 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -779,28 +779,18 @@ public class CraftWorld implements World {
|
||||
|
@ -59,7 +59,7 @@ index bfa8c23..827ec16 100644
|
|||
}
|
||||
|
||||
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
|
||||
@@ -1286,6 +1276,56 @@ public class CraftWorld implements World {
|
||||
@@ -1290,6 +1280,56 @@ public class CraftWorld implements World {
|
||||
// Spigot start
|
||||
private final Spigot spigot = new Spigot()
|
||||
{
|
||||
|
@ -117,7 +117,7 @@ index bfa8c23..827ec16 100644
|
|||
|
||||
public Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index cb858a0..5de0000 100644
|
||||
index dd80ab7..4d4516f 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1325,6 +1325,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
@ -171,5 +171,5 @@ index cb858a0..5de0000 100644
|
|||
|
||||
public Player.Spigot spigot()
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From ecf02f20012ab07610255ca303377134bb36f9f3 Mon Sep 17 00:00:00 2001
|
||||
From d2dd0fc6612d7c94a574ba9bfca8616b5ed6b6a2 Mon Sep 17 00:00:00 2001
|
||||
From: DerFlash <bte@freenet.de>
|
||||
Date: Tue, 9 Jul 2013 00:11:12 +0200
|
||||
Subject: [PATCH] Save ticks lived to nbttag
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index b13968d..27b0a25 100644
|
||||
index 327daae..998fd36 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1132,6 +1132,7 @@ public abstract class Entity {
|
||||
@@ -1134,6 +1134,7 @@ public abstract class Entity {
|
||||
nbttagcompound.setLong("WorldUUIDLeast", this.world.getDataManager().getUUID().getLeastSignificantBits());
|
||||
nbttagcompound.setLong("WorldUUIDMost", this.world.getDataManager().getUUID().getMostSignificantBits());
|
||||
nbttagcompound.setInt("Bukkit.updateLevel", CURRENT_LEVEL);
|
||||
|
@ -16,7 +16,7 @@ index b13968d..27b0a25 100644
|
|||
// CraftBukkit end
|
||||
this.b(nbttagcompound);
|
||||
if (this.vehicle != null) {
|
||||
@@ -1200,6 +1201,8 @@ public abstract class Entity {
|
||||
@@ -1202,6 +1203,8 @@ public abstract class Entity {
|
||||
if (this instanceof EntityLiving) {
|
||||
EntityLiving entity = (EntityLiving) this;
|
||||
|
||||
|
@ -26,5 +26,5 @@ index b13968d..27b0a25 100644
|
|||
if (entity instanceof EntityTameableAnimal && !isLevelAtLeast(nbttagcompound, 2) && !nbttagcompound.getBoolean("PersistenceRequired")) {
|
||||
EntityInsentient entityinsentient = (EntityInsentient) entity;
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From abfeaef11caa4887359f27df0a3a9dc631b99ac6 Mon Sep 17 00:00:00 2001
|
||||
From 78b6f43b0063ceed96a513e5a861b7a59f76bdbc 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 27b0a25..0ec07c2 100644
|
||||
index 998fd36..c4bdccf 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -118,6 +118,7 @@ public abstract class Entity {
|
||||
@@ -120,6 +120,7 @@ public abstract class Entity {
|
||||
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
|
||||
public final boolean defaultActivationState;
|
||||
public long activatedTick = 0;
|
||||
|
@ -80,5 +80,5 @@ index 042280d..558e9cd 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 9fa021fc53595329dbb06c9bf2430846146bfbad Mon Sep 17 00:00:00 2001
|
||||
From 963fdf81cdc62893dbcd4246e28a9fdf73b3df17 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,10 +7,10 @@ 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 0ec07c2..c049cd8 100644
|
||||
index c4bdccf..c542460 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1021,6 +1021,7 @@ public abstract class Entity {
|
||||
@@ -1023,6 +1023,7 @@ public abstract class Entity {
|
||||
|
||||
public void b_(EntityHuman entityhuman) {}
|
||||
|
||||
|
@ -62,5 +62,5 @@ index 1290829..b12a086 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 1a0029c6cbdf522e8b1cdd6d7d834b0360ae0c73 Mon Sep 17 00:00:00 2001
|
||||
From 84c1d0d0a562ceea87ea7203113102e48a0ed3c9 Mon Sep 17 00:00:00 2001
|
||||
From: drXor <mcyoungsota@gmail.com>
|
||||
Date: Sun, 23 Feb 2014 16:16:59 -0400
|
||||
Subject: [PATCH] Implement Silenceable Lightning API
|
||||
|
@ -37,10 +37,10 @@ index 2fd88c0..35806d1 100644
|
|||
this.world.makeSound(this.locX, this.locY, this.locZ, "random.explode", 2.0F, 0.5F + this.random.nextFloat() * 0.2F);
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 827ec16..154b868 100644
|
||||
index 58c64fd..19cff55 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -1326,6 +1326,22 @@ public class CraftWorld implements World {
|
||||
@@ -1330,6 +1330,22 @@ public class CraftWorld implements World {
|
||||
{
|
||||
CraftWorld.this.playEffect( location, effect, 0 );
|
||||
}
|
||||
|
@ -101,5 +101,5 @@ index 64e346d..be4f10f 100644
|
|||
+ // Spigot end
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 8f15821f59865e394ecd6e3c03c8df483918bf68 Mon Sep 17 00:00:00 2001
|
||||
From e6d30fec201e289154842583df812bffb9b10af0 Mon Sep 17 00:00:00 2001
|
||||
From: drXor <mcyoungsota@gmail.com>
|
||||
Date: Sat, 15 Mar 2014 01:30:05 -0400
|
||||
Subject: [PATCH] Descriptive kick reasons instead of Nope!
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index c049cd8..37a9cae 100644
|
||||
index c542460..961927b 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -218,7 +218,7 @@ public abstract class Entity {
|
||||
@@ -220,7 +220,7 @@ public abstract class Entity {
|
||||
if ((f == Float.POSITIVE_INFINITY) || (f == Float.NEGATIVE_INFINITY)) {
|
||||
if (this instanceof EntityPlayer) {
|
||||
this.world.getServer().getLogger().warning(((CraftPlayer) this.getBukkitEntity()).getName() + " was caught trying to crash the server with an invalid yaw");
|
||||
|
@ -17,7 +17,7 @@ index c049cd8..37a9cae 100644
|
|||
}
|
||||
f = 0;
|
||||
}
|
||||
@@ -231,7 +231,7 @@ public abstract class Entity {
|
||||
@@ -233,7 +233,7 @@ public abstract class Entity {
|
||||
if ((f1 == Float.POSITIVE_INFINITY) || (f1 == Float.NEGATIVE_INFINITY)) {
|
||||
if (this instanceof EntityPlayer) {
|
||||
this.world.getServer().getLogger().warning(((CraftPlayer) this.getBukkitEntity()).getName() + " was caught trying to crash the server with an invalid pitch");
|
||||
|
@ -27,7 +27,7 @@ index c049cd8..37a9cae 100644
|
|||
f1 = 0;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 55db414..6f30e6d 100644
|
||||
index f645690..170ab7e 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -184,7 +184,7 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
|
@ -49,5 +49,5 @@ index 55db414..6f30e6d 100644
|
|||
}
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 7326c2d7d2432a8898a42b86406a383934023512 Mon Sep 17 00:00:00 2001
|
||||
From 1d656f452be97d6681875b04c4fd5142ace84c4b 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 f53b183..9a8408c 100644
|
||||
index dbf30cb..64b0992 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
||||
@@ -550,7 +550,14 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
|
||||
|
@ -25,10 +25,10 @@ index f53b183..9a8408c 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
|
||||
index 99526b9..2ba0a81 100644
|
||||
index 352f739..2c7d9f6 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityWither.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityWither.java
|
||||
@@ -172,7 +172,14 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
|
||||
@@ -173,7 +173,14 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
|
||||
// CraftBukkit end
|
||||
|
||||
this.world.createExplosion(this, this.locX, this.locY + (double) this.getHeadHeight(), this.locZ, 7.0F, false, this.world.getGameRules().getBoolean("mobGriefing"));
|
||||
|
@ -66,5 +66,5 @@ index b12a086..312fa55 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From b10521c8fbd8be80380d7a0f625b20d4ad80e70e Mon Sep 17 00:00:00 2001
|
||||
From 1441910574b7f650f36372c0c1321ce86c8f8958 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 5978ea3..1b1ed9b 100644
|
||||
index 7d67210..6104597 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
@@ -1000,6 +1000,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
|
||||
@@ -1001,6 +1001,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
|
||||
if (nbttagcompound.hasKeyOfType("OwnerUUID", 8)) {
|
||||
this.setOwnerUUID(nbttagcompound.getString("OwnerUUID"));
|
||||
}
|
||||
|
@ -24,5 +24,5 @@ index 5978ea3..1b1ed9b 100644
|
|||
if (nbttagcompound.hasKey("Bukkit.MaxDomestication")) {
|
||||
this.maxDomestication = nbttagcompound.getInt("Bukkit.MaxDomestication");
|
||||
--
|
||||
1.8.5.2.msysgit.0
|
||||
1.9.1
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user