From af9a0657edc523c1bb2706edac84170ced18473a Mon Sep 17 00:00:00 2001
From: dragon <mydragonos@outlook.com>
Date: Mon, 7 Nov 2022 14:48:24 +0800
Subject: [PATCH] fix ShapeType

I compared them with the _original_ files and fixed them.There is no `ShapeType.proto` in fact.The imports in the proto files may be generated by a script,which mistakenly import a wrong file.Should use `ObstacleInfo.ShapeType` and import `ObstacleInfo.proto`.Believe in me.
---
 proto/GMObstacleInfo.proto        | 4 ++--
 proto/ObstacleInfo.proto          | 6 +++---
 proto/ToTheMoonObstacleInfo.proto | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/proto/GMObstacleInfo.proto b/proto/GMObstacleInfo.proto
index 56a41421..624b9d69 100644
--- a/proto/GMObstacleInfo.proto
+++ b/proto/GMObstacleInfo.proto
@@ -18,7 +18,7 @@
 syntax = "proto3";
 
 import "MathQuaternion.proto";
-//import "ShapeType.proto";
+import "ObstacleInfo.proto";
 import "Vector.proto";
 import "Vector3Int.proto";
 
@@ -26,7 +26,7 @@ option java_package = "emu.grasscutter.net.proto";
 
 message GMObstacleInfo {
   int64 timestamp = 14;
-  //ShapeType shape = 2;
+  ObstacleInfo.ShapeType shape = 2;
   int32 obstacle_id = 13;
   MathQuaternion rotation = 3;
   Vector center = 8;
diff --git a/proto/ObstacleInfo.proto b/proto/ObstacleInfo.proto
index e328edc8..c862e215 100644
--- a/proto/ObstacleInfo.proto
+++ b/proto/ObstacleInfo.proto
@@ -27,13 +27,13 @@ message ObstacleInfo {
   MathQuaternion rotation = 4;
   int32 obstacle_id = 2;
   Vector center = 14;
-  //ShapeType shape = 6;
+  ShapeType shape = 6;
   Vector3Int extents = 12;
 
-/*
+
   enum ShapeType {
     SHAPE_TYPE_OBSTACLE_SHAPE_CAPSULE = 0;
     SHAPE_TYPE_OBSTACLE_SHAPE_BOX = 1;
   }
-  */
+  
 }
diff --git a/proto/ToTheMoonObstacleInfo.proto b/proto/ToTheMoonObstacleInfo.proto
index 271423a1..36953338 100644
--- a/proto/ToTheMoonObstacleInfo.proto
+++ b/proto/ToTheMoonObstacleInfo.proto
@@ -23,16 +23,16 @@ import "Vector.proto";
 option java_package = "emu.grasscutter.net.proto";
 
 message ToTheMoonObstacleInfo {
-  //ShapeType type = 2;
+  ShapeType type = 2;
   int32 handle_id = 11;
   MathQuaternion rotation = 7;
   Vector center = 13;
   Vector half_extents = 14;
 
-/*
+
   enum ShapeType {
     SHAPE_TYPE_OBSTACLE_SHAPE_CAPSULE = 0;
     SHAPE_TYPE_OBSTACLE_SHAPE_BOX = 1;
   }
-  */
+  
 }