summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/NetServerHandler.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/NetServerHandler.java')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java102
1 files changed, 57 insertions, 45 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index cf6ecc85..316de4af 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -1,12 +1,12 @@
package net.minecraft.server;
-import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Random;
-import java.util.logging.Level;
import java.util.logging.Logger;
// CraftBukkit start
+import java.io.UnsupportedEncodingException;
+import java.util.logging.Level;
import java.util.Arrays;
import java.util.HashSet;
@@ -349,7 +349,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
}
float f4 = 0.0625F;
- boolean flag = worldserver.a(this.player, this.player.boundingBox.clone().shrink((double) f4, (double) f4, (double) f4)).size() == 0;
+ boolean flag = worldserver.getCubes(this.player, this.player.boundingBox.clone().shrink((double) f4, (double) f4, (double) f4)).size() == 0;
if (this.player.onGround && !packet10flying.g && d6 > 0.0D) {
this.player.c(0.2F);
@@ -357,7 +357,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.player.move(d4, d6, d7);
this.player.onGround = packet10flying.g;
- this.player.b(d4, d6, d7);
+ this.player.checkMovement(d4, d6, d7);
double d9 = d6;
d4 = d1 - this.player.locX;
@@ -378,7 +378,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
}
this.player.setLocation(d1, d2, d3, f2, f3);
- boolean flag2 = worldserver.a(this.player, this.player.boundingBox.clone().shrink((double) f4, (double) f4, (double) f4)).size() == 0;
+ boolean flag2 = worldserver.getCubes(this.player, this.player.boundingBox.clone().shrink((double) f4, (double) f4, (double) f4)).size() == 0;
if (flag && (flag1 || !flag2) && !this.player.isSleeping()) {
this.a(this.x, this.y, this.z, f2, f3);
@@ -682,7 +682,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.disconnected = true;
}
- public void a(Packet packet) {
+ public void onUnhandledPacket(Packet packet) {
if (this.disconnected) return; // CraftBukkit
logger.warning(this.getClass() + " wasn\'t prepared to deal with a " + packet.getClass());
this.disconnect("Protocol error, unexpected packet");
@@ -987,7 +987,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// CraftBukkit end
}
- public void a(Packet101CloseWindow packet101closewindow) {
+ public void handleContainerClose(Packet101CloseWindow packet101closewindow) {
if (this.player.dead) return; // CraftBukkit
// CraftBukkit start - INVENTORY_CLOSE hook
@@ -1005,14 +1005,14 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
if (this.player.activeContainer.windowId == packet102windowclick.a && this.player.activeContainer.c(this.player)) {
// CraftBukkit start - fire InventoryClickEvent
InventoryView inventory = this.player.activeContainer.getBukkitView();
- SlotType type = CraftInventoryView.getSlotType(inventory, packet102windowclick.b);
+ SlotType type = CraftInventoryView.getSlotType(inventory, packet102windowclick.slot);
InventoryClickEvent event;
if (inventory instanceof CraftingInventory) {
Recipe recipe = ((CraftingInventory)inventory.getTopInventory()).getRecipe();
- event = new CraftItemEvent(recipe, inventory, type, packet102windowclick.b, packet102windowclick.c != 0, packet102windowclick.f);
+ event = new CraftItemEvent(recipe, inventory, type, packet102windowclick.slot, packet102windowclick.button != 0, packet102windowclick.shift);
} else {
- event = new InventoryClickEvent(inventory, type, packet102windowclick.b, packet102windowclick.c != 0, packet102windowclick.f);
+ event = new InventoryClickEvent(inventory, type, packet102windowclick.slot, packet102windowclick.button != 0, packet102windowclick.shift);
}
server.getPluginManager().callEvent(event);
@@ -1021,7 +1021,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
switch(event.getResult()) {
case DEFAULT:
- itemstack = this.player.activeContainer.a(packet102windowclick.b, packet102windowclick.c, packet102windowclick.f, this.player);
+ itemstack = this.player.activeContainer.clickItem(packet102windowclick.slot, packet102windowclick.button, packet102windowclick.shift, this.player);
defaultBehaviour = true;
break;
case DENY: // Deny any change, including changes from the event
@@ -1029,30 +1029,30 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
case ALLOW: // Allow changes unconditionally
org.bukkit.inventory.ItemStack cursor = event.getCursor();
if (cursor == null) {
- this.player.inventory.b((ItemStack) null);
+ this.player.inventory.setCarried((ItemStack) null);
} else {
- this.player.inventory.b(CraftItemStack.createNMSItemStack(cursor));
+ this.player.inventory.setCarried(CraftItemStack.createNMSItemStack(cursor));
}
org.bukkit.inventory.ItemStack item = event.getCurrentItem();
if (item != null) {
itemstack = CraftItemStack.createNMSItemStack(item);
- if(packet102windowclick.b == -999) {
- this.player.b(itemstack);
+ if (packet102windowclick.slot == -999) {
+ this.player.drop(itemstack);
} else {
- this.player.activeContainer.b(packet102windowclick.b).c(itemstack);
+ this.player.activeContainer.getSlot(packet102windowclick.slot).set(itemstack);
}
- } else if (packet102windowclick.b != -999) {
- this.player.activeContainer.b(packet102windowclick.b).c((ItemStack) null);
+ } else if (packet102windowclick.slot != -999) {
+ this.player.activeContainer.getSlot(packet102windowclick.slot).set((ItemStack) null);
}
break;
}
// CraftBukkit end
- if (defaultBehaviour && ItemStack.matches(packet102windowclick.e, itemstack)) { // CraftBukkit - additional condition added
+ if (defaultBehaviour && ItemStack.matches(packet102windowclick.item, itemstack)) { // CraftBukkit - additional condition added
this.player.netServerHandler.sendPacket((Packet) (new Packet106Transaction(packet102windowclick.a, packet102windowclick.d, true)));
this.player.h = true;
this.player.activeContainer.a();
- this.player.D();
+ this.player.broadcastCarriedItem();
this.player.h = false;
} else {
this.r.a(this.player.activeContainer.windowId, Short.valueOf(packet102windowclick.d));
@@ -1083,58 +1083,70 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
public void a(Packet107SetCreativeSlot packet107setcreativeslot) {
if (this.player.itemInWorldManager.isCreative()) {
- boolean flag = packet107setcreativeslot.a < 0;
+ boolean flag = packet107setcreativeslot.slot < 0;
ItemStack itemstack = packet107setcreativeslot.b;
- boolean flag1 = packet107setcreativeslot.a >= 36 && packet107setcreativeslot.a < 36 + PlayerInventory.getHotbarSize();
- boolean flag2 = itemstack == null || itemstack.id < Item.byId.length && itemstack.id >= 0 && Item.byId[itemstack.id] != null && !invalidItems.contains(itemstack.id); // CraftBukkit
+ boolean flag1 = packet107setcreativeslot.slot >= 36 && packet107setcreativeslot.slot < 36 + PlayerInventory.getHotbarSize();
+ // CraftBukkit
+ boolean flag2 = itemstack == null || itemstack.id < Item.byId.length && itemstack.id >= 0 && Item.byId[itemstack.id] != null && !invalidItems.contains(itemstack.id);
boolean flag3 = itemstack == null || itemstack.getData() >= 0 && itemstack.getData() >= 0 && itemstack.count <= 64 && itemstack.count > 0;
// CraftBukkit start - Fire INVENTORY_CLICK event
HumanEntity player = this.player.getBukkitEntity();
InventoryView inventory = new CraftInventoryView(player, player.getInventory(), this.player.defaultContainer);
SlotType slot = SlotType.QUICKBAR;
- if (packet107setcreativeslot.a == -1) {
+ if (packet107setcreativeslot.slot == -1) {
slot = SlotType.OUTSIDE;
}
- InventoryClickEvent event = new InventoryClickEvent(inventory, slot, slot == SlotType.OUTSIDE ? -999 : packet107setcreativeslot.a, false, false);
+
+ InventoryClickEvent event = new InventoryClickEvent(inventory, slot, slot == SlotType.OUTSIDE ? -999 : packet107setcreativeslot.slot, false, false);
server.getPluginManager().callEvent(event);
org.bukkit.inventory.ItemStack item = event.getCurrentItem();
- if (event.getResult() == Result.ALLOW) {
+
+ switch (event.getResult()) {
+ case ALLOW:
if (slot == SlotType.QUICKBAR) {
if (item == null) {
- this.player.defaultContainer.a(packet107setcreativeslot.a, (ItemStack) null);
+ this.player.defaultContainer.setItem(packet107setcreativeslot.slot, (ItemStack) null);
} else {
- this.player.defaultContainer.a(packet107setcreativeslot.a, CraftItemStack.createNMSItemStack(item));
+ this.player.defaultContainer.setItem(packet107setcreativeslot.slot, CraftItemStack.createNMSItemStack(item));
}
} else if (item != null) {
- this.player.b(CraftItemStack.createNMSItemStack(item));
+ this.player.drop(CraftItemStack.createNMSItemStack(item));
}
- } else if (event.getResult() == Result.DENY) {
+ return;
+ case DENY:
// TODO: Will this actually work?
- if (packet107setcreativeslot.a > -1) {
- this.player.netServerHandler.sendPacket(new Packet103SetSlot(this.player.defaultContainer.windowId, packet107setcreativeslot.a, CraftItemStack.createNMSItemStack(item)));
+ if (packet107setcreativeslot.slot > -1) {
+ this.player.netServerHandler.sendPacket(new Packet103SetSlot(this.player.defaultContainer.windowId, packet107setcreativeslot.slot, CraftItemStack.createNMSItemStack(item)));
}
this.player.netServerHandler.sendPacket(new Packet103SetSlot(this.player.defaultContainer.windowId, -1, null));
- } else if (event.getResult() == Result.DEFAULT) {
- // CraftBukkit end
- if (flag1 && flag2 && flag3) {
- if (itemstack == null) {
- this.player.defaultContainer.a(packet107setcreativeslot.a, (ItemStack) null);
- } else {
- this.player.defaultContainer.a(packet107setcreativeslot.a, itemstack);
- }
- this.player.defaultContainer.a(this.player, true);
- } else if (flag && flag2 && flag3) {
- this.player.b(itemstack);
+ return;
+ case DEFAULT:
+ // We do the stuff below
+ break;
+ default:
+ return;
+ }
+ // CraftBukkit end
+
+ if (flag1 && flag2 && flag3) {
+ if (itemstack == null) {
+ this.player.defaultContainer.setItem(packet107setcreativeslot.slot, (ItemStack) null);
+ } else {
+ this.player.defaultContainer.setItem(packet107setcreativeslot.slot, itemstack);
}
- } // CraftBukkit closing brace
+
+ this.player.defaultContainer.a(this.player, true);
+ } else if (flag && flag2 && flag3) {
+ this.player.drop(itemstack);
+ }
}
}
public void a(Packet106Transaction packet106transaction) {
if (this.player.dead) return; // CraftBukkit
- Short oshort = (Short) this.r.a(this.player.activeContainer.windowId);
+ Short oshort = (Short) this.r.get(this.player.activeContainer.windowId);
if (oshort != null && packet106transaction.b == oshort.shortValue() && this.player.activeContainer.windowId == packet106transaction.a && !this.player.activeContainer.c(this.player)) {
this.player.activeContainer.a(this.player, true);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 16:02:36 +0000