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

Add proper logging for custom channel exceptions.

Browse Source
This commit is contained in:
Eimref 2013-02-06 18:59:07 -05:00 committed by Wesley Wolfe
parent f6c574dd04
commit cf7dfeda62
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/net/minecraft/server/PlayerConnection.java
View File

@ -1463,7 +1463,10 @@ public class PlayerConnection extends Connection {
itemstack1.a("pages", (NBTBase) itemstack.getTag().getList("pages")); itemstack1.a("pages", (NBTBase) itemstack.getTag().getList("pages"));
} }
} catch (Exception exception) { } catch (Exception exception) {
exception.printStackTrace(); // CraftBukkit start
logger.log(Level.WARNING, this.player.name + " sent invalid MC|BEdit data", exception);
this.disconnect("Invalid book data!");
// CraftBukkit end
} }
} else if ("MC|BSign".equals(packet250custompayload.tag)) { } else if ("MC|BSign".equals(packet250custompayload.tag)) {
try { try {
@ -1482,7 +1485,8 @@ public class PlayerConnection extends Connection {
} }
} catch (Exception exception1) { } catch (Exception exception1) {
// CraftBukkit start // CraftBukkit start
// exception1.printStackTrace(); logger.log(Level.WARNING, this.player.name + " sent invalid MC|BSign data", exception);
this.disconnect("Invalid book data!");
// CraftBukkit end // CraftBukkit end
} }
} else { } else {
@ -1498,7 +1502,10 @@ public class PlayerConnection extends Connection {
((ContainerMerchant) container).b(i); ((ContainerMerchant) container).b(i);
} }
} catch (Exception exception2) { } catch (Exception exception2) {
exception2.printStackTrace(); // CraftBukkit start
logger.log(Level.WARNING, this.player.name + " sent invalid MC|TrSel data", exception);
this.disconnect("Invalid trade data!");
// CraftBukkit end
} }
} else { } else {
int j; int j;
@ -1521,7 +1528,10 @@ public class PlayerConnection extends Connection {
this.player.sendMessage("Command set: " + s); this.player.sendMessage("Command set: " + s);
} }
} catch (Exception exception3) { } catch (Exception exception3) {
exception3.printStackTrace(); // CraftBukkit start
logger.log(Level.WARNING, this.player.name + " sent invalid MC|AdvCdm data", exception);
this.disconnect("Invalid CommandBlock data!");
// CraftBukkit end
} }
} else { } else {
this.player.sendMessage(this.player.a("advMode.notAllowed", new Object[0])); this.player.sendMessage(this.player.a("advMode.notAllowed", new Object[0]));
@ -1544,7 +1554,10 @@ public class PlayerConnection extends Connection {
tileentitybeacon.update(); tileentitybeacon.update();
} }
} catch (Exception exception4) { } catch (Exception exception4) {
exception4.printStackTrace(); // CraftBukkit start
logger.log(Level.WARNING, this.player.name + " sent invalid MC|Beacon data", exception);
this.disconnect("Invalid beacon data!");
// CraftBukkit end
} }
} }
} else if ("MC|ItemName".equals(packet250custompayload.tag) && this.player.activeContainer instanceof ContainerAnvil) { } else if ("MC|ItemName".equals(packet250custompayload.tag) && this.player.activeContainer instanceof ContainerAnvil) {
@ -1568,7 +1581,7 @@ public class PlayerConnection extends Connection {
getPlayer().addChannel(channel); getPlayer().addChannel(channel);
} }
} catch (UnsupportedEncodingException ex) { } catch (UnsupportedEncodingException ex) {
Logger.getLogger(PlayerConnection.class.getName()).log(Level.SEVERE, "Could not parse REGISTER payload in plugin message packet", ex); throw new AssertionError(ex);
} }
} else if (packet250custompayload.tag.equals("UNREGISTER")) { } else if (packet250custompayload.tag.equals("UNREGISTER")) {
try { try {
@ -1577,7 +1590,7 @@ public class PlayerConnection extends Connection {
getPlayer().removeChannel(channel); getPlayer().removeChannel(channel);
} }
} catch (UnsupportedEncodingException ex) { } catch (UnsupportedEncodingException ex) {
Logger.getLogger(PlayerConnection.class.getName()).log(Level.SEVERE, "Could not parse UNREGISTER payload in plugin message packet", ex); throw new AssertionError(ex);
} }
} else { } else {
server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packet250custompayload.tag, packet250custompayload.data); server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packet250custompayload.tag, packet250custompayload.data);