Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 20:40:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

Fixed losing an infinite item when interacting with an entity. Thanks for the help Rigby!

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EvilSeph 2011-06-19 01:44:57 -04:00
Ursprung 12b7499c4f
Commit a6e5c97223
2 geänderte Dateien mit 14 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
src/main/java/net/minecraft/server/EntityHuman.java
Datei anzeigen

@ -512,7 +512,8 @@ public abstract class EntityHuman extends EntityLiving {
if (itemstack != null && entity instanceof EntityLiving) {
itemstack.a((EntityLiving) entity);
if (itemstack.count <= 0) {
// CraftBukkit - bypass infinite items; <= 0 -> == 0
if (itemstack.count == 0) {
itemstack.a(this);
this.G();
}
@ -573,7 +574,8 @@ public abstract class EntityHuman extends EntityLiving {
if (itemstack != null && entity instanceof EntityLiving) {
itemstack.a((EntityLiving) entity, this);
if (itemstack.count <= 0) {
// CraftBukkit - bypass infinite items; <= 0 -> == 0
if (itemstack.count == 0) {
itemstack.a(this);
this.G();
}

10
src/main/java/net/minecraft/server/NetServerHandler.java
Datei anzeigen

@ -869,8 +869,18 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
}
// CraftBukkit end
this.player.c(entity);
// CraftBukkit start - update the client if the item is an infinite one
if (this.player.inventory.getItemInHand().count <= -1) {
this.player.a(this.player.activeContainer);
}
// CraftBukkit end
} else if (packet7useentity.c == 1) {
this.player.d(entity);
// CraftBukkit start - update the client if the item is an infinite one
if (this.player.inventory.getItemInHand().count <= -1) {
this.player.a(this.player.activeContainer);
}
// CraftBukkit end
}
}
}