SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Merge pull request #10 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/SPIGOT-58 to master

Quellcode durchsuchen 
* commit 'c8a76994dcad959b306d6e84e0b73f23571f3e14':
  Horses spawned under Y 0 cause CraftBukkit to crash. This happens a lot since people keep using bugged Horses for Holographics
Dieser Commit ist enthalten in:
Thinkofdeath 2014-11-30 02:05:29 +02:00
Commit 73f4bc3434
1 geänderte Dateien mit 21 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

28
nms-patches/EntityHorse.patch
Datei anzeigen

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityHorse.java 2014-11-28 17:43:43.101707435 +0000 --- ../work/decompile-8eb82bde//net/minecraft/server/EntityHorse.java Sun Nov 30 00:00:30 2014
+++ src/main/java/net/minecraft/server/EntityHorse.java 2014-11-28 17:38:22.000000000 +0000 +++ src/main/java/net/minecraft/server/EntityHorse.java Sun Nov 30 00:00:14 2014
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -61,12 +61,12 @@
} }
+ // CraftBukkit end */ + // CraftBukkit end */
+ } + }
+
+ // CraftBukkit start - Add method + // CraftBukkit start - Add method
+ @Override + @Override
+ protected void dropDeathLoot(boolean flag, int i) { + protected void dropDeathLoot(boolean flag, int i) {
+ super.dropDeathLoot(flag, i); + super.dropDeathLoot(flag, i);
+
+ // Moved from die method above + // Moved from die method above
+ if (!this.world.isStatic) { + if (!this.world.isStatic) {
+ this.dropChest(); + this.dropChest();
@ -85,7 +85,21 @@
} }
if (!this.cw() && this.passenger == null && this.random.nextInt(300) == 0 && this.world.getType(new BlockPosition(MathHelper.floor(this.locX), MathHelper.floor(this.locY) - 1, MathHelper.floor(this.locZ))).getBlock() == Blocks.GRASS) { if (!this.cw() && this.passenger == null && this.random.nextInt(300) == 0 && this.world.getType(new BlockPosition(MathHelper.floor(this.locX), MathHelper.floor(this.locY) - 1, MathHelper.floor(this.locZ))).getBlock() == Blocks.GRASS) {
@@ -949,6 +965,7 @@ @@ -730,6 +746,13 @@
}
public void s_() {
+ // CraftBukkit start - Remove out of bounds horses, fixes an vanilla bug
+ if ( this.locY < -600 ) {
+ die();
+ return;
+ }
+ // CraftBukkit end
+
super.s_();
if (this.world.isStatic && this.datawatcher.a()) {
this.datawatcher.e();
@@ -949,6 +972,7 @@
nbttagcompound.setInt("Temper", this.getTemper()); nbttagcompound.setInt("Temper", this.getTemper());
nbttagcompound.setBoolean("Tame", this.isTame()); nbttagcompound.setBoolean("Tame", this.isTame());
nbttagcompound.setString("OwnerUUID", this.getOwnerUUID()); nbttagcompound.setString("OwnerUUID", this.getOwnerUUID());
@ -93,7 +107,7 @@
if (this.hasChest()) { if (this.hasChest()) {
NBTTagList nbttaglist = new NBTTagList(); NBTTagList nbttaglist = new NBTTagList();
@@ -1001,6 +1018,12 @@ @@ -1001,6 +1025,12 @@
this.setOwnerUUID(s); this.setOwnerUUID(s);
} }
@ -106,7 +120,7 @@
AttributeInstance attributeinstance = this.getAttributeMap().a("Speed"); AttributeInstance attributeinstance = this.getAttributeMap().a("Speed");
if (attributeinstance != null) { if (attributeinstance != null) {
@@ -1166,18 +1189,25 @@ @@ -1166,18 +1196,25 @@
public void v(int i) { public void v(int i) {
if (this.cE()) { if (this.cE()) {