Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 03:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Fixed exploit allowing people to place blocks anywhere

Browse Source
This commit is contained in:
Dinnerbone 2011-03-09 19:43:49 +00:00
parent b819ffe8a4
commit 9aa582885a
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@ -25,6 +25,7 @@ import org.bukkit.event.player.*;
public class NetServerHandler extends NetHandler implements ICommandListener { public class NetServerHandler extends NetHandler implements ICommandListener {
private static final int PLACE_DISTANCE_SQUARED = 6 * 6; // CraftBukkit here for now
public static Logger a = Logger.getLogger("Minecraft"); public static Logger a = Logger.getLogger("Minecraft");
public NetworkManager b; public NetworkManager b;
public boolean c = false; public boolean c = false;
@ -436,6 +437,14 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
PlayerItemEvent event = new PlayerItemEvent(eventType, who, itemInHand, blockClicked, blockFace); PlayerItemEvent event = new PlayerItemEvent(eventType, who, itemInHand, blockClicked, blockFace);
if (blockClicked != null && blockFace != null) {
CraftBlock block = (CraftBlock)blockClicked.getFace(blockFace);
Location eyeLoc = getPlayer().getEyeLocation();
if (Math.pow(eyeLoc.getX() - block.getX(), 2) + Math.pow(eyeLoc.getY() - block.getY(), 2) + Math.pow(eyeLoc.getZ() - block.getZ(), 2) > PLACE_DISTANCE_SQUARED) {
return;
}
}
// CraftBukkit We still call this event even in spawn protection. // CraftBukkit We still call this event even in spawn protection.
// Don't call this event if using Buckets / signs // Don't call this event if using Buckets / signs
switch (itemInHand.getType()) { switch (itemInHand.getType()) {
@ -474,6 +483,10 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
} }
// CraftBukkit start - spawn protection moved to ItemBlock!!! // CraftBukkit start - spawn protection moved to ItemBlock!!!
Location eyeLoc = getPlayer().getEyeLocation();
if (Math.pow(eyeLoc.getX() - i, 2) + Math.pow(eyeLoc.getY() - j, 2) + Math.pow(eyeLoc.getZ() - k, 2) > PLACE_DISTANCE_SQUARED) {
return;
}
CraftItemStack craftItem = new CraftItemStack(itemstack); CraftItemStack craftItem = new CraftItemStack(itemstack);
Player player = getPlayer(); Player player = getPlayer();
BlockRightClickEvent event = new BlockRightClickEvent(Type.BLOCK_RIGHTCLICKED, blockClicked, blockFace, craftItem, player); BlockRightClickEvent event = new BlockRightClickEvent(Type.BLOCK_RIGHTCLICKED, blockClicked, blockFace, craftItem, player);