Merge pull request #12 from GTNewHorizons/fix-long-chat-crash

Add a chat message length limit to avoid crashing with too big packets

Author: Dream-Master

build.gradle

@@ -1,4 +1,4 @@
-//version: 1646409286
+//version: 1650343995
 /*
 DO NOT CHANGE THIS FILE!
 
@@ -568,7 +568,7 @@ publishing {
                 artifact source: shadowJar, classifier: ""
             }
             if(!noPublishedSources) {
-                artifact source: sourcesJar, classifier: "src"
+                artifact source: sourcesJar, classifier: "sources"
             }
             artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
             if (apiPackage) {

src/main/java/minetweaker/api/player/IPlayer.java

@@ -35,6 +35,8 @@ public interface IPlayer {
     @ZenMethod
     void sendChat(IChatMessage message);
 
+    int MAX_CHAT_MESSAGE_LENGTH = 512;
+
     @ZenMethod
     void sendChat(String message);
 

src/main/java/minetweaker/mc1710/player/CommandBlockPlayer.java

@@ -37,22 +37,22 @@ public String getName(){
     public IData getData(){
         return null;
     }
-    
+
     @Override
     public int getXP() {
         return 0;
     }
-    
+
     @Override
     public void setXP(int xp) {
-    
+
     }
-    
+
     @Override
     public void removeXP(int xp) {
-    
+
     }
-    
+
     @Override
     public void update(IData data){
 
@@ -70,6 +70,10 @@ public void sendChat(IChatMessage message){
 
     @Override
     public void sendChat(String message){
+        if (message.length() > MAX_CHAT_MESSAGE_LENGTH)
+        {
+            message = message.substring(0, MAX_CHAT_MESSAGE_LENGTH);
+        }
         sender.addChatMessage(new ChatComponentText(message));
     }
 

src/main/java/minetweaker/mc1710/player/MCPlayer.java

@@ -51,25 +51,25 @@ public String getName() {
 	public IData getData() {
 		return NBTConverter.from(player.getEntityData(), true);
 	}
-    
+
     @Override
     public int getXP() {
         return player.experienceLevel;
     }
-    
+
     @Override
     public void setXP(int xp) {
         player.experienceLevel = 0;
         player.addExperienceLevel(xp);
     }
-    
+
     @Override
     public void removeXP(int xp) {
         final int newLvl = Math.max(0, player.experienceLevel - xp);
         player.experienceLevel = 0;
         player.addExperienceLevel(newLvl);
     }
-    
+
     @Override
 	public void update(IData data) {
 		NBTConverter.updateMap(player.getEntityData(), data);
@@ -87,6 +87,10 @@ public void sendChat(IChatMessage message) {
 
 	@Override
 	public void sendChat(String message) {
+        if (message.length() > MAX_CHAT_MESSAGE_LENGTH)
+        {
+            message = message.substring(0, MAX_CHAT_MESSAGE_LENGTH);
+        }
 		player.addChatMessage(new ChatComponentText(message));
 	}
 

src/main/java/minetweaker/mc1710/player/RconPlayer.java

@@ -38,22 +38,22 @@ public String getName() {
     public IData getData() {
         return null;
     }
-    
+
     @Override
     public int getXP() {
         return 0;
     }
-    
+
     @Override
     public void setXP(int xp) {
-    
+
     }
-    
+
     @Override
     public void removeXP(int xp) {
-    
+
     }
-    
+
     @Override
     public void update(IData data) {
 

src/main/java/minetweaker/mc1710/server/ServerPlayer.java

@@ -48,22 +48,22 @@ public IData getData() {
 		// TODO: implement
 		return null;
 	}
-    
+
     @Override
     public int getXP() {
         return 0;
     }
-    
+
     @Override
     public void setXP(int xp) {
-    
+
     }
-    
+
     @Override
     public void removeXP(int xp) {
-    
+
     }
-    
+
     @Override
 	public void update(IData data) {
 		// TODO: implement