Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-16 21:10:17 +01:00
Code Issues Projekte Releases Wiki Aktivität

Fixed NPEs in infinite item loss fix

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EvilSeph 2011-06-19 13:58:38 -04:00
Ursprung cb7b82d452
Commit 7ac53dfc8b
1 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

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

@ -858,6 +858,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
WorldServer worldserver = this.minecraftServer.a(this.player.dimension); WorldServer worldserver = this.minecraftServer.a(this.player.dimension);
Entity entity = worldserver.getEntity(packet7useentity.target); Entity entity = worldserver.getEntity(packet7useentity.target);
ItemStack itemInHand = this.player.inventory.getItemInHand();
if (entity != null && this.player.e(entity) && this.player.g(entity) < 36.0D) { if (entity != null && this.player.e(entity) && this.player.g(entity) < 36.0D) {
if (packet7useentity.c == 0) { if (packet7useentity.c == 0) {
@ -870,14 +871,14 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// CraftBukkit end // CraftBukkit end
this.player.c(entity); this.player.c(entity);
// CraftBukkit start - update the client if the item is an infinite one // CraftBukkit start - update the client if the item is an infinite one
if (this.player.inventory.getItemInHand().count <= -1) { if (itemInHand != null && itemInHand.count <= -1) {
this.player.a(this.player.activeContainer); this.player.a(this.player.activeContainer);
} }
// CraftBukkit end // CraftBukkit end
} else if (packet7useentity.c == 1) { } else if (packet7useentity.c == 1) {
this.player.d(entity); this.player.d(entity);
// CraftBukkit start - update the client if the item is an infinite one // CraftBukkit start - update the client if the item is an infinite one
if (this.player.inventory.getItemInHand().count <= -1) { if (itemInHand != null && itemInHand.count <= -1) {
this.player.a(this.player.activeContainer); this.player.a(this.player.activeContainer);
} }
// CraftBukkit end // CraftBukkit end