mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-12-11 16:11:02 -05:00
24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Video <videogamesm12@gmail.com>
|
||
|
Date: Fri, 19 Aug 2022 00:49:38 -0600
|
||
|
Subject: [PATCH] Fixes out of bounds HangingEntity crash exploit
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
|
||
|
index ca9decf85dd1af0baf0d34a48aa67cbb9f4eb586..50cbd324b87300d6b872581571fa97ad9fa54396 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
|
||
|
@@ -265,7 +265,11 @@ public abstract class HangingEntity extends Entity {
|
||
|
|
||
|
@Override
|
||
|
public void readAdditionalSaveData(CompoundTag nbt) {
|
||
|
- this.pos = new BlockPos(nbt.getInt("TileX"), nbt.getInt("TileY"), nbt.getInt("TileZ"));
|
||
|
+ // Scissors start - Fixes exploit where bad TileX, TileY, and TileZ coordinates can crash servers
|
||
|
+ BlockPos pos = new BlockPos(nbt.getInt("TileX"), nbt.getInt("TileY"), nbt.getInt("TileZ"));
|
||
|
+ if (level.isLoadedAndInBounds(pos))
|
||
|
+ this.pos = pos;
|
||
|
+ // Scissors end
|
||
|
}
|
||
|
|
||
|
public abstract int getWidth();
|